Skip to content

fix(team): harden isolated worktree execution #179

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
terisuke merged 1 commit into from
Apr 24, 2026
Merged

fix(team): harden isolated worktree execution #179

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
16 changes: 15 additions & 1 deletion packages/guardrails/profile/plugins/guardrail-git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ type Review = {
}

export function createGitHandlers(ctx: GuardrailContext, review: Review) {
function teamWorker() {
return /(?:^|[\\/])\.opencode[\\/]team[\\/]/.test(ctx.input.worktree)
}

async function bashBeforeGit(cmd: string, out: { output?: string }, data: Record<string, unknown>) {
const isMerge = /\bgit\s+merge(\s|$)/i.test(cmd) || /\bgh\s+pr\s+merge(\s|$)/i.test(cmd)
const isPrMerge = /\bgh\s+pr\s+merge\b/i.test(cmd)
Expand Down Expand Up @@ -138,6 +142,11 @@ export function createGitHandlers(ctx: GuardrailContext, review: Review) {
}

const protectedBranch = /^(main|master|develop|dev)$/
if (/\bgit\s+stash\s+pop\b/i.test(cmd)) {
await ctx.mark({ last_block: "bash", last_command: cmd, last_reason: "stash pop blocked: use apply then drop" })
throw new Error("Guardrail policy blocked this action: stash pop blocked: use `git stash apply`, inspect conflicts, then `git stash drop` after verification")
}

if (/\bgit\s+push\b/i.test(cmd)) {
const explicitMatch = cmd.match(/\bgit\s+push\s+(?:(?:-\w+|--[\w-]+)\s+)*\S+\s+(?:HEAD:)?(\S+)/i)
if (explicitMatch && protectedBranch.test(explicitMatch[1])) {
Expand All @@ -161,6 +170,11 @@ export function createGitHandlers(ctx: GuardrailContext, review: Review) {

if (/\bgit\s+(checkout\s+-b|switch\s+-c)\b/i.test(cmd)) {
try {
const status = await git(ctx.input.worktree, ["status", "--porcelain"])
if (status.code === 0 && status.stdout.trim()) {
await ctx.mark({ last_block: "bash", last_command: cmd, last_reason: "branch creation with dirty worktree blocked" })
throw new Error("Guardrail policy blocked this action: branch creation blocked because the worktree has uncommitted changes. Commit or use `git stash push --include-untracked` before creating the branch.")
}
const devCheck = await git(ctx.input.worktree, ["rev-parse", "--verify", "origin/develop"])
if (devCheck.code === 0 && devCheck.stdout.trim()) {
const branchCheck = await git(ctx.input.worktree, ["branch", "--show-current"])
Expand All @@ -176,6 +190,7 @@ export function createGitHandlers(ctx: GuardrailContext, review: Review) {
}

if (/\bgit\s+(cherry-pick)\b/i.test(cmd) && !/--abort\b/i.test(cmd)) {
if (teamWorker()) return
await ctx.mark({ last_block: "bash", last_command: cmd, last_reason: "cherry-pick blocked: delegate to Codex CLI" })
throw new Error("Guardrail policy blocked this action: cherry-pick blocked: delegate to Codex CLI for context-heavy merge operations")
}
Expand Down Expand Up @@ -433,4 +448,3 @@ export function createGitHandlers(ctx: GuardrailContext, review: Review) {

return { bashBeforeGit, bashAfterGit }
}

Loading
Loading