fix(codex): remove duplicate agents table from reference config (#1032)

.codex/config.toml

@@ -101,7 +101,6 @@ approval_policy = "never"
 sandbox_mode = "workspace-write"
 web_search = "live"
 
-[agents]
 [agents]
 # Multi-agent role limits and local role definitions.
 # These map to `.codex/agents/*.toml` and mirror the repo's explorer/reviewer/docs workflow.

scripts/codex/check-codex-global-state.sh

@@ -8,14 +8,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 CODEX_HOME="${CODEX_HOME:-$HOME/.codex}"
 
-# Use rg if available, otherwise fall back to grep -E.
-# All patterns in this script must be POSIX ERE compatible.
-if command -v rg >/dev/null 2>&1; then
-  search_file() { rg -n "$1" "$2" >/dev/null 2>&1; }
-else
-  search_file() { grep -En "$1" "$2" >/dev/null 2>&1; }
-fi
-
 CONFIG_FILE="$CODEX_HOME/config.toml"
 AGENTS_FILE="$CODEX_HOME/AGENTS.md"
 PROMPTS_DIR="$CODEX_HOME/prompts"
@@ -56,7 +48,7 @@ require_file() {
 check_config_pattern() {
   local pattern="$1"
   local label="$2"
-  if search_file "$pattern" "$CONFIG_FILE"; then
+  if rg -n "$pattern" "$CONFIG_FILE" >/dev/null 2>&1; then
     ok "$label"
   else
     fail "$label"
@@ -66,7 +58,7 @@ check_config_pattern() {
 check_config_absent() {
   local pattern="$1"
   local label="$2"
-  if search_file "$pattern" "$CONFIG_FILE"; then
+  if rg -n "$pattern" "$CONFIG_FILE" >/dev/null 2>&1; then
     fail "$label"
   else
     ok "$label"
@@ -81,13 +73,13 @@ require_file "$CONFIG_FILE" "Global config.toml"
 require_file "$AGENTS_FILE" "Global AGENTS.md"
 
 if [[ -f "$AGENTS_FILE" ]]; then
-  if search_file '^# Everything Claude Code \(ECC\)' "$AGENTS_FILE"; then
+  if rg -n '^# Everything Claude Code \(ECC\) — Agent Instructions' "$AGENTS_FILE" >/dev/null 2>&1; then
     ok "AGENTS contains ECC root instructions"
   else
     fail "AGENTS missing ECC root instructions"
   fi
 
-  if search_file '^# Codex Supplement \(From ECC \.codex/AGENTS\.md\)' "$AGENTS_FILE"; then
+  if rg -n '^# Codex Supplement \(From ECC \.codex/AGENTS\.md\)' "$AGENTS_FILE" >/dev/null 2>&1; then
     ok "AGENTS contains ECC Codex supplement"
   else
     fail "AGENTS missing ECC Codex supplement"
@@ -95,11 +87,11 @@ if [[ -f "$AGENTS_FILE" ]]; then
 fi
 
 if [[ -f "$CONFIG_FILE" ]]; then
-  check_config_pattern '^multi_agent[[:space:]]*=[[:space:]]*true' "multi_agent is enabled"
+  check_config_pattern '^multi_agent\s*=\s*true' "multi_agent is enabled"
-  check_config_absent '^[[:space:]]*collab[[:space:]]*=' "deprecated collab flag is absent"
+  check_config_absent '^\s*collab\s*=' "deprecated collab flag is absent"
   # persistent_instructions is recommended but optional; warn instead of fail
   # so users who rely on AGENTS.md alone are not blocked (#967).
-  if search_file '^[[:space:]]*persistent_instructions[[:space:]]*=' "$CONFIG_FILE"; then
+  if rg -n '^[[:space:]]*persistent_instructions\s*=' "$CONFIG_FILE" >/dev/null 2>&1; then
     ok "persistent_instructions is configured"
   else
     warn "persistent_instructions is not set (recommended but optional)"
@@ -113,7 +105,7 @@ if [[ -f "$CONFIG_FILE" ]]; then
     'mcp_servers.sequential-thinking' \
     'mcp_servers.context7'
   do
-    if search_file "^\[$section\]" "$CONFIG_FILE"; then
+    if rg -n "^\[$section\]" "$CONFIG_FILE" >/dev/null 2>&1; then
       ok "MCP section [$section] exists"
     else
       fail "MCP section [$section] missing"
@@ -123,11 +115,11 @@ if [[ -f "$CONFIG_FILE" ]]; then
   has_context7_legacy=0
   has_context7_current=0
 
-  if search_file '^\[mcp_servers\.context7\]' "$CONFIG_FILE"; then
+  if rg -n '^\[mcp_servers\.context7\]' "$CONFIG_FILE" >/dev/null 2>&1; then
     has_context7_legacy=1
   fi
 
-  if search_file '^\[mcp_servers\.context7-mcp\]' "$CONFIG_FILE"; then
+  if rg -n '^\[mcp_servers\.context7-mcp\]' "$CONFIG_FILE" >/dev/null 2>&1; then
     has_context7_current=1
   fi
 

tests/scripts/check-unicode-safety.test.js

@@ -89,7 +89,7 @@ if (
 
     const result = runCheck(root, ['--write']);
     assert.notStrictEqual(result.status, 0, result.stdout + result.stderr);
-    assert.match(result.stderr, /scripts[/\\]sample\.js:1:23 emoji U\+1F680/);
+    assert.match(result.stderr, /scripts\/sample\.js:1:23 emoji U\+1F680/);
     assert.strictEqual(fs.readFileSync(scriptFile, 'utf8'), original);
   })
 )

tests/scripts/codex-hooks.test.js

@@ -66,11 +66,7 @@ function makeHermeticCodexEnv(homeDir, codexDir, extraEnv = {}) {
 let passed = 0;
 let failed = 0;
 
-// Windows NTFS does not allow double-quote characters in file paths,
+if (
-// so the quoted-path shell-injection test is only meaningful on Unix.
-if (os.platform() === 'win32') {
-  console.log('  - install-global-git-hooks.sh quoted paths (skipped on Windows)');
-} else if (
   test('install-global-git-hooks.sh handles quoted hook paths without shell injection', () => {
     const homeDir = createTempDir('codex-hooks-home-');
     const weirdHooksDir = path.join(homeDir, 'git-hooks "quoted"');

tests/scripts/openclaw-persona-forge-gacha.test.js

@@ -30,7 +30,6 @@ function runGacha(pythonBin, arg) {
   return spawnSync(pythonBin, [SCRIPT, arg], {
     encoding: 'utf8',
     maxBuffer: 10 * 1024 * 1024,
-    env: { ...process.env, PYTHONUTF8: '1' },
   });
 }