mirror of
https://github.com/obra/superpowers.git
synced 2026-11-06 23:18:21 +00:00
38fd8323e4
Drew requested resolution of the merge conflict in obra/superpowers PR #2601. Merge current dev into the existing PR branch without rewriting its history. Resolve the V2 bootstrap hunk by keeping #2601's shared handler registered on context, compaction, and generate, and incorporating #2600's exact BOOTSTRAP_MARKER prefix guard. This preserves injection for prompts that merely mention EXTREMELY_IMPORTANT while preventing duplicate bootstrap parts. All other dev changes merge without manual edits. Validation: bash tests/opencode/run-tests.sh passed all five suites, including hook registration, tag-mention regression coverage, child-session suppression, caching, and skill registration. git diff --cached --check passed and the index contains no unresolved paths. Live OpenCode integration sessions were not rerun for this conflict-only repair. Tracking: PRI-3674 |
||
|---|---|---|
| .. | ||
| run-tests.sh | ||
| setup.sh | ||
| test-bootstrap-caching.mjs | ||
| test-bootstrap-caching.sh | ||
| test-hook-registration.mjs | ||
| test-hook-registration.sh | ||
| test-plugin-loading.sh | ||
| test-priority.sh | ||
| test-session-bootstrap.mjs | ||
| test-session-bootstrap.sh | ||
| test-skill-registration.mjs | ||
| test-skill-registration.sh | ||
| test-tools.sh | ||