Skip to content

Commit ed30c38

Browse files
zenusclaude
andcommitted
fix: resolve semantic merge conflicts from refine-plan + zenus/main merge
- Fix heredoc delimiter mismatch in loop-codex-stop-hook.sh (opening AGENT_TEAMS_FALLBACK_EOF vs closing WORKTREE_TEAMS_FALLBACK_EOF) - Update codex-worker.sh to use renamed DEFAULT_CODEX_MODEL/EFFORT variables from refine-plan's loop-common.sh (was DEFAULT_CODEX_WORKER_*) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 03a4cc9 commit ed30c38

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

hooks/loop-codex-stop-hook.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ if [[ "$WORKTREE_TEAMS" == "true" ]] && [[ "$REVIEW_STARTED" != "true" ]]; then
18671867
18681868
Continue using scheduler/worker/reviewer worktree orchestration.
18691869
Each task must be explicitly marked parallelizable (`yes` or `no`) before assignment.
1870-
WORKTREE_TEAMS_FALLBACK_EOF
1870+
AGENT_TEAMS_FALLBACK_EOF
18711871
fi
18721872
fi
18731873

scripts/codex-worker.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
2727
# Source portable timeout wrapper
2828
source "$SCRIPT_DIR/portable-timeout.sh"
2929

30-
# Source shared loop library for DEFAULT_CODEX_WORKER_MODEL and DEFAULT_CODEX_WORKER_EFFORT
30+
# Source shared loop library for DEFAULT_CODEX_MODEL and DEFAULT_CODEX_EFFORT
3131
HOOKS_LIB_DIR="$(cd "$SCRIPT_DIR/../hooks/lib" && pwd)"
3232
source "$HOOKS_LIB_DIR/loop-common.sh"
3333

@@ -37,8 +37,8 @@ source "$HOOKS_LIB_DIR/loop-common.sh"
3737

3838
DEFAULT_CODEX_WORKER_TIMEOUT=5400
3939

40-
WORKER_MODEL="$DEFAULT_CODEX_WORKER_MODEL"
41-
WORKER_EFFORT="$DEFAULT_CODEX_WORKER_EFFORT"
40+
WORKER_MODEL="$DEFAULT_CODEX_MODEL"
41+
WORKER_EFFORT="$DEFAULT_CODEX_EFFORT"
4242
WORKER_TIMEOUT="$DEFAULT_CODEX_WORKER_TIMEOUT"
4343
WORKDIR=""
4444

@@ -103,7 +103,7 @@ while [[ $# -gt 0 ]]; do
103103
WORKER_EFFORT="${2#*:}"
104104
else
105105
WORKER_MODEL="$2"
106-
WORKER_EFFORT="$DEFAULT_CODEX_WORKER_EFFORT"
106+
WORKER_EFFORT="$DEFAULT_CODEX_EFFORT"
107107
fi
108108
shift 2
109109
;;

0 commit comments

Comments
 (0)