Skip to content

Move protected-branch edits into agent worktrees automatically #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NagyVikt merged 1 commit into from
Apr 11, 2026
Merged

Move protected-branch edits into agent worktrees automatically #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 78 additions & 0 deletions scripts/agent-branch-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,53 @@ resolve_active_codex_snapshot_name() {
| tr -d '\r' || true
}

has_local_changes() {
local root="$1"
if ! git -C "$root" diff --quiet; then
return 0
fi
if ! git -C "$root" diff --cached --quiet; then
return 0
fi
if [[ -n "$(git -C "$root" ls-files --others --exclude-standard)" ]]; then
return 0
fi
return 1
}

has_tracked_changes() {
local root="$1"
if ! git -C "$root" diff --quiet; then
return 0
fi
if ! git -C "$root" diff --cached --quiet; then
return 0
fi
return 1
}

resolve_protected_branches() {
local root="$1"
local raw
raw="${MUSAFETY_PROTECTED_BRANCHES:-$(git -C "$root" config --get multiagent.protectedBranches || true)}"
if [[ -z "$raw" ]]; then
raw="dev main master"
fi
raw="${raw//,/ }"
printf '%s' "$raw"
}

is_protected_branch_name() {
local branch="$1"
local protected_raw="$2"
for protected_branch in $protected_raw; do
if [[ "$branch" == "$protected_branch" ]]; then
return 0
fi
done
return 1
}

if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
echo "[agent-branch-start] Not inside a git repository." >&2
exit 1
Expand Down Expand Up @@ -163,13 +210,44 @@ if [[ -e "$worktree_path" ]]; then
exit 1
fi

auto_transfer_stash_ref=""
auto_transfer_message=""
current_branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
protected_branches_raw="$(resolve_protected_branches "$repo_root")"
if [[ "$current_branch" == "$BASE_BRANCH" ]] && is_protected_branch_name "$BASE_BRANCH" "$protected_branches_raw"; then
if has_tracked_changes "$repo_root"; then
auto_transfer_message="musafety-auto-transfer-${timestamp}-${agent_slug}-${task_slug}"
if git -C "$repo_root" stash push --include-untracked --message "$auto_transfer_message" >/dev/null 2>&1; then
auto_transfer_stash_ref="$(
git -C "$repo_root" stash list \
| awk -v msg="$auto_transfer_message" '$0 ~ msg { ref=$1; sub(/:$/, "", ref); print ref; exit }'
)"
if [[ -n "$auto_transfer_stash_ref" ]]; then
echo "[agent-branch-start] Detected local changes on protected base '${BASE_BRANCH}'. Moving them to '${branch_name}'..."
fi
fi
fi
fi

git -C "$repo_root" worktree add -b "$branch_name" "$worktree_path" "$start_ref"
git -C "$repo_root" config "branch.${branch_name}.musafetyBase" "$BASE_BRANCH" >/dev/null 2>&1 || true

if git -C "$repo_root" show-ref --verify --quiet "refs/remotes/origin/${BASE_BRANCH}"; then
git -C "$worktree_path" branch --set-upstream-to="origin/${BASE_BRANCH}" "$branch_name" >/dev/null 2>&1 || true
fi

if [[ -n "$auto_transfer_stash_ref" ]]; then
if git -C "$worktree_path" stash apply "$auto_transfer_stash_ref" >/dev/null 2>&1; then
git -C "$repo_root" stash drop "$auto_transfer_stash_ref" >/dev/null 2>&1 || true
echo "[agent-branch-start] Moved local changes from '${BASE_BRANCH}' into '${branch_name}'."
else
echo "[agent-branch-start] Failed to auto-apply moved changes in new worktree." >&2
echo "[agent-branch-start] Changes are preserved in ${auto_transfer_stash_ref} on ${BASE_BRANCH}." >&2
echo "[agent-branch-start] Apply manually with: git -C \"$worktree_path\" stash apply \"${auto_transfer_stash_ref}\"" >&2
exit 1
fi
fi

echo "[agent-branch-start] Created branch: ${branch_name}"
echo "[agent-branch-start] Worktree: ${worktree_path}"
echo "[agent-branch-start] Next steps:"
Expand Down
78 changes: 78 additions & 0 deletions templates/scripts/agent-branch-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,53 @@ resolve_active_codex_snapshot_name() {
| tr -d '\r' || true
}

has_local_changes() {
local root="$1"
if ! git -C "$root" diff --quiet; then
return 0
fi
if ! git -C "$root" diff --cached --quiet; then
return 0
fi
if [[ -n "$(git -C "$root" ls-files --others --exclude-standard)" ]]; then
return 0
fi
return 1
}

has_tracked_changes() {
local root="$1"
if ! git -C "$root" diff --quiet; then
return 0
fi
if ! git -C "$root" diff --cached --quiet; then
return 0
fi
return 1
}

resolve_protected_branches() {
local root="$1"
local raw
raw="${MUSAFETY_PROTECTED_BRANCHES:-$(git -C "$root" config --get multiagent.protectedBranches || true)}"
if [[ -z "$raw" ]]; then
raw="dev main master"
fi
raw="${raw//,/ }"
printf '%s' "$raw"
}

is_protected_branch_name() {
local branch="$1"
local protected_raw="$2"
for protected_branch in $protected_raw; do
if [[ "$branch" == "$protected_branch" ]]; then
return 0
fi
done
return 1
}

if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
echo "[agent-branch-start] Not inside a git repository." >&2
exit 1
Expand Down Expand Up @@ -195,13 +242,44 @@ if [[ -e "$worktree_path" ]]; then
exit 1
fi

auto_transfer_stash_ref=""
auto_transfer_message=""
current_branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
protected_branches_raw="$(resolve_protected_branches "$repo_root")"
if [[ "$current_branch" == "$BASE_BRANCH" ]] && is_protected_branch_name "$BASE_BRANCH" "$protected_branches_raw"; then
if has_tracked_changes "$repo_root"; then
auto_transfer_message="musafety-auto-transfer-${timestamp}-${agent_slug}-${task_slug}"
if git -C "$repo_root" stash push --include-untracked --message "$auto_transfer_message" >/dev/null 2>&1; then
auto_transfer_stash_ref="$(
git -C "$repo_root" stash list \
| awk -v msg="$auto_transfer_message" '$0 ~ msg { ref=$1; sub(/:$/, "", ref); print ref; exit }'
)"
if [[ -n "$auto_transfer_stash_ref" ]]; then
echo "[agent-branch-start] Detected local changes on protected base '${BASE_BRANCH}'. Moving them to '${branch_name}'..."
fi
fi
fi
fi

git -C "$repo_root" worktree add -b "$branch_name" "$worktree_path" "$start_ref"
git -C "$repo_root" config "branch.${branch_name}.musafetyBase" "$BASE_BRANCH" >/dev/null 2>&1 || true

if git -C "$repo_root" show-ref --verify --quiet "refs/remotes/origin/${BASE_BRANCH}"; then
git -C "$worktree_path" branch --set-upstream-to="origin/${BASE_BRANCH}" "$branch_name" >/dev/null 2>&1 || true
fi

if [[ -n "$auto_transfer_stash_ref" ]]; then
if git -C "$worktree_path" stash apply "$auto_transfer_stash_ref" >/dev/null 2>&1; then
git -C "$repo_root" stash drop "$auto_transfer_stash_ref" >/dev/null 2>&1 || true
echo "[agent-branch-start] Moved local changes from '${BASE_BRANCH}' into '${branch_name}'."
else
echo "[agent-branch-start] Failed to auto-apply moved changes in new worktree." >&2
echo "[agent-branch-start] Changes are preserved in ${auto_transfer_stash_ref} on ${BASE_BRANCH}." >&2
echo "[agent-branch-start] Apply manually with: git -C \"$worktree_path\" stash apply \"${auto_transfer_stash_ref}\"" >&2
exit 1
fi
fi

echo "[agent-branch-start] Created branch: ${branch_name}"
echo "[agent-branch-start] Worktree: ${worktree_path}"
echo "[agent-branch-start] Next steps:"
Expand Down
40 changes: 40 additions & 0 deletions test/install.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,46 @@ test('setup agent-branch-start defaults base to current branch and stores per-br
assert.equal(storedBase.stdout.trim(), 'main');
});

test('agent-branch-start moves protected-branch local changes into the new agent worktree', () => {
const repoDir = initRepoOnBranch('main');
seedCommit(repoDir);
attachOriginRemoteForBranch(repoDir, 'main');

let result = runNode(['setup', '--target', repoDir, '--no-global-install'], repoDir);
assert.equal(result.status, 0, result.stderr || result.stdout);

result = runCmd('git', ['add', '.'], repoDir);
assert.equal(result.status, 0, result.stderr);
result = runCmd('git', ['commit', '-m', 'apply musafety setup'], repoDir, {
ALLOW_COMMIT_ON_PROTECTED_BRANCH: '1',
});
assert.equal(result.status, 0, result.stderr || result.stdout);
result = runCmd('git', ['push', 'origin', 'main'], repoDir);
assert.equal(result.status, 0, result.stderr || result.stdout);

const packageJsonPath = path.join(repoDir, 'package.json');
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
packageJson.name = 'demo-edited';
fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, 'utf8');
fs.writeFileSync(path.join(repoDir, 'scratch-note.txt'), 'untracked change\n', 'utf8');

result = runCmd('bash', ['scripts/agent-branch-start.sh', 'move-readme', 'bot'], repoDir);
assert.equal(result.status, 0, result.stderr || result.stdout);
const agentWorktree = extractCreatedWorktree(result.stdout);
assert.match(result.stdout, /Moved local changes from 'main' into 'agent\/bot\//);

const rootStatus = runCmd('git', ['status', '--short', '--untracked-files=no'], repoDir);
assert.equal(rootStatus.status, 0, rootStatus.stderr || rootStatus.stdout);
assert.equal(rootStatus.stdout.trim(), '', 'base branch checkout should be clean after auto-transfer');

assert.match(fs.readFileSync(path.join(agentWorktree, 'package.json'), 'utf8'), /"name": "demo-edited"/);
assert.equal(fs.existsSync(path.join(agentWorktree, 'scratch-note.txt')), true, 'untracked file should move');

const stashList = runCmd('git', ['stash', 'list'], repoDir);
assert.equal(stashList.status, 0, stashList.stderr || stashList.stdout);
assert.doesNotMatch(stashList.stdout, /musafety-auto-transfer-/);
});

test('agent-branch-finish infers base from source branch metadata and updates main worktree', () => {
const repoDir = initRepoOnBranch('main');
seedCommit(repoDir);
Expand Down
Loading