diff options
| author | Drew Ritter <drew@primeradiant.com> | 2026-08-04 14:55:28 -0700 |
|---|---|---|
| committer | Drew Ritter <drew@primeradiant.com> | 2026-08-04 14:55:28 -0700 |
| commit | 36f3883f4ef1b3ca70307fd05509c9a501d772a3 (patch) | |
| tree | 8e24e5a7bcec57f543d36e5211e5dbacec2c50b1 /tests | |
| parent | 05c2393b826dd0f09cd071427e62b42e6c751995 (diff) | |
fix(codex): restore Superpowers after compactioncodex-spinout-fixes
Codex re-fires SessionStart with source "compact" after every context
compaction; the summary keeps progress but sheds the bootstrap and any
active skill's instructions — measured July cause of post-compaction
dispatch drift in long SDD runs (with re-injection: 18/18 hook fires,
66/66 post-compaction dispatch tuples correct in a 12.4h stress run).
Codex discovers skills natively at startup, so the hook is silent
there: the compact re-fire is the one unowned lifecycle point.
Adds the plugin-provided hook (hooks-codex.json + session-start-codex,
compact-only, fails open), wires it into the manifest and package,
documents install/trust behavior, updates codex-tools.md with the
re-grounding fallback, and tests the hook lifecycle, manifest, and
archive contents.
Rebuilt from the July codex-spinout-fixes branch, pared to the hook
core: the dispatch-hints layer it used to ride with is superseded by
the merged 2059-2062/2077-2080 stack and is dropped.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codex/test-marketplace-manifest.sh | 36 | ||||
| -rwxr-xr-x | tests/codex/test-package-codex-plugin.sh | 7 | ||||
| -rwxr-xr-x | tests/hooks/test-session-start-codex.sh | 115 |
3 files changed, 144 insertions, 14 deletions
diff --git a/tests/codex/test-marketplace-manifest.sh b/tests/codex/test-marketplace-manifest.sh index 4301a06..3bdde0b 100755 --- a/tests/codex/test-marketplace-manifest.sh +++ b/tests/codex/test-marketplace-manifest.sh @@ -52,25 +52,37 @@ if not plugin_manifest.exists(): manifest = json.loads(plugin_manifest.read_text(encoding="utf-8")) assert_equal(manifest.get("name"), plugin.get("name"), "plugin manifest name") -# Codex auto-discovers a plugin's hooks/hooks.json whenever the Codex manifest -# has no `hooks` field: load_plugin_hooks falls back to a hardcoded -# DEFAULT_HOOKS_CONFIG_FILE = "hooks/hooks.json" and registers it. That file is -# the Claude Code SessionStart hook, it is tracked in this repo, and this -# marketplace installs the whole repo root (source url "./"), so on Codex the -# fallback re-registers the SessionStart hook and its install-time trust prompt. -# Declaring an empty inline hooks object ({}) parses as an empty inline hook set -# and suppresses the auto-discovery. An absent field, an empty array ([]), and -# an empty inline list all collapse back to the fallback, so the value must be -# exactly an empty object. +# The Codex manifest must declare its hooks explicitly. An absent field makes +# load_plugin_hooks fall back to a hardcoded DEFAULT_HOOKS_CONFIG_FILE = +# "hooks/hooks.json" — the Claude Code SessionStart hook, which injects the +# bootstrap at startup and must not run on Codex. The explicit pointer both +# registers the Codex compaction re-injection hook and overrides that fallback. hooks_config = repo_root / "hooks" / "hooks.json" if not hooks_config.exists(): raise AssertionError("hooks/hooks.json must exist (Claude Code SessionStart hook)") assert_equal( manifest.get("hooks"), - {}, - "Codex manifest must declare empty hooks {} to suppress hooks/hooks.json auto-discovery", + "./hooks/hooks-codex.json", + "Codex manifest must point hooks at the Codex hook config (an absent field " + "falls back to auto-discovering the Claude Code hooks/hooks.json)", ) +codex_hooks_path = repo_root / "hooks" / "hooks-codex.json" +if not codex_hooks_path.exists(): + raise AssertionError("hooks/hooks-codex.json must exist (Codex manifest points at it)") + +codex_hooks = json.loads(codex_hooks_path.read_text(encoding="utf-8")) +session_start = codex_hooks["hooks"]["SessionStart"] +assert_equal(len(session_start), 1, "Codex SessionStart hook group count") +assert_equal(session_start[0].get("matcher"), "compact", "Codex hook matcher") +entry = session_start[0]["hooks"][0] +assert_equal(entry.get("type"), "command", "Codex hook type") +command = entry.get("command", "") +if "${PLUGIN_ROOT}" not in command or not command.endswith("session-start-codex"): + raise AssertionError( + f"Codex hook command must run session-start-codex via ${{PLUGIN_ROOT}}: {command!r}" + ) + print("Codex marketplace manifest looks good") PY diff --git a/tests/codex/test-package-codex-plugin.sh b/tests/codex/test-package-codex-plugin.sh index 947cb6d..b782bf4 100755 --- a/tests/codex/test-package-codex-plugin.sh +++ b/tests/codex/test-package-codex-plugin.sh @@ -141,7 +141,7 @@ tar_extracted="$TEST_ROOT/tar-extracted" write_metadata_fixture "$metadata_source" source_hooks="$(python3 -c 'import json; print(json.load(open("'"$REPO_ROOT"'/.codex-plugin/plugin.json")).get("hooks"))')" -assert_equals "$source_hooks" "{}" "source Codex manifest suppresses local hook auto-discovery" +assert_equals "$source_hooks" "./hooks/hooks-codex.json" "source Codex manifest declares the Codex hook config" if output="$("$SCRIPT_UNDER_TEST" --allow-dirty --metadata-source "$metadata_source" --output "$archive" 2>&1)"; then pass "package script exits successfully" @@ -163,10 +163,13 @@ assert_contains "$output" "SHA-256:" "reports archive checksum" extract_archive "$archive" "$extracted" archive_paths="$(list_archive "$archive" | normalize_archive_paths)" -unexpected_pattern='(^superpowers/|^\.agents/|^hooks/|package\.json$|^\.git|^\.pytest_cache|^\.ruff_cache|^scripts/|^tests/|^docs/|^evals/|^lib/|^\.claude|^\.cursor|^\.kimi|^\.opencode|^\.pi|^AGENTS\.md$|^CLAUDE\.md$|^GEMINI\.md$|^RELEASE-NOTES\.md$|^CHANGELOG\.md$)' +unexpected_pattern='(^superpowers/|^\.agents/|^hooks/hooks\.json$|^hooks/hooks-cursor\.json$|^hooks/session-start$|package\.json$|^\.git|^\.pytest_cache|^\.ruff_cache|^scripts/|^tests/|^docs/|^evals/|^lib/|^\.claude|^\.cursor|^\.kimi|^\.opencode|^\.pi|^AGENTS\.md$|^CLAUDE\.md$|^GEMINI\.md$|^RELEASE-NOTES\.md$|^CHANGELOG\.md$)' assert_not_matches "$archive_paths" "$unexpected_pattern" "archive excludes source-only paths" assert_contains "$archive_paths" ".codex-plugin/plugin.json" "archive includes Codex manifest" assert_contains "$archive_paths" "skills/brainstorming/SKILL.md" "archive includes skills" +assert_contains "$archive_paths" "hooks/hooks-codex.json" "archive includes Codex hook config" +assert_contains "$archive_paths" "hooks/session-start-codex" "archive includes Codex hook script" +assert_contains "$archive_paths" "hooks/run-hook.cmd" "archive includes hook runner" assert_contains "$archive_paths" "skills/brainstorming/agents/openai.yaml" "archive includes OpenAI skill metadata" assert_contains "$archive_paths" "assets/app-icon.png" "archive includes app icon" assert_contains "$archive_paths" "assets/superpowers-small.svg" "archive includes composer icon" diff --git a/tests/hooks/test-session-start-codex.sh b/tests/hooks/test-session-start-codex.sh new file mode 100755 index 0000000..713fa28 --- /dev/null +++ b/tests/hooks/test-session-start-codex.sh @@ -0,0 +1,115 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" +HOOK_UNDER_TEST="$REPO_ROOT/hooks/session-start-codex" +CONFIG_UNDER_TEST="$REPO_ROOT/hooks/hooks-codex.json" + +FAILURES=0 + +pass() { + echo " [PASS] $1" +} + +fail() { + echo " [FAIL] $1" + FAILURES=$((FAILURES + 1)) +} + +# run_hook <stdin-payload> — echoes hook stdout; fails the calling test on +# non-zero exit. env -i mirrors the codex hook executor's clean environment. +run_hook() { + printf '%s' "$1" | env -i PATH="${PATH:-}" bash "$HOOK_UNDER_TEST" +} + +echo "Codex SessionStart hook tests" + +startup_payload='{"session_id":"s","hook_event_name":"SessionStart","model":"gpt-5.6-terra","source":"startup"}' +if output="$(run_hook "$startup_payload")" && [ -z "$output" ]; then + pass "source=startup emits nothing and exits 0" +else + fail "source=startup emits nothing and exits 0" + printf '%s\n' "$output" | head -3 | sed 's/^/ /' +fi + +compact_payload='{"session_id":"s","hook_event_name":"SessionStart","model":"gpt-5.6-terra","source":"compact"}' +if output="$(run_hook "$compact_payload")"; then + ok=1 + for needle in \ + "<EXTREMELY_IMPORTANT>" \ + "You have superpowers." \ + "name: using-superpowers" \ + "<CONTEXT_RESTORED>" \ + "subagent-driven-development/SKILL.md" \ + "references/codex-tools.md"; do + if [[ "$output" != *"$needle"* ]]; then + ok=0 + echo " missing: $needle" + fi + done + if [ "$ok" -eq 1 ]; then + pass "source=compact emits bootstrap plus re-read addendum" + else + fail "source=compact emits bootstrap plus re-read addendum" + fi +else + fail "source=compact emits bootstrap plus re-read addendum (hook exited non-zero)" +fi + +# Whitespace-tolerant source matching (serializers vary). +spaced_payload='{"hook_event_name":"SessionStart", "source" : "compact"}' +if output="$(run_hook "$spaced_payload")" && [[ "$output" == *"<CONTEXT_RESTORED>"* ]]; then + pass "whitespace around the source key still triggers injection" +else + fail "whitespace around the source key still triggers injection" +fi + +if output="$(printf '' | env -i PATH="${PATH:-}" bash "$HOOK_UNDER_TEST")" && [ -z "$output" ]; then + pass "empty stdin fails open to no output, exit 0" +else + fail "empty stdin fails open to no output, exit 0" +fi + +if output="$(run_hook 'not json at all {{{')" && [ -z "$output" ]; then + pass "garbage stdin fails open to no output, exit 0" +else + fail "garbage stdin fails open to no output, exit 0" +fi + +# A compact mention inside some other field must not trigger injection. +decoy_payload='{"hook_event_name":"SessionStart","source":"startup","cwd":"/tmp/compact"}' +if output="$(run_hook "$decoy_payload")" && [ -z "$output" ]; then + pass "compact appearing outside the source field does not trigger" +else + fail "compact appearing outside the source field does not trigger" +fi + +if node -e ' +const config = JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")); +const group = config.hooks.SessionStart[0]; +if (group.matcher !== "compact") { + console.error(`hook matcher is ${JSON.stringify(group.matcher)}, expected "compact"`); + process.exit(1); +} +const entry = group.hooks[0]; +if (entry.type !== "command") { + console.error(`hook type is ${JSON.stringify(entry.type)}, expected "command"`); + process.exit(1); +} +if (!entry.command.includes("${PLUGIN_ROOT}") || !/run-hook\.cmd" session-start-codex$/.test(entry.command)) { + console.error(`unexpected command shape: ${entry.command}`); + process.exit(1); +} +' "$CONFIG_UNDER_TEST"; then + pass "hooks-codex.json runs session-start-codex via \${PLUGIN_ROOT} on compact" +else + fail "hooks-codex.json runs session-start-codex via \${PLUGIN_ROOT} on compact" +fi + +if [[ "$FAILURES" -gt 0 ]]; then + echo "STATUS: FAILED ($FAILURES failure(s))" + exit 1 +fi + +echo "STATUS: PASSED" |
