diff options
| author | Drew Ritter <drew@primeradiant.com> | 2026-11-02 13:31:53 -0800 |
|---|---|---|
| committer | Drew Ritter <drew@primeradiant.com> | 2026-11-02 13:31:53 -0800 |
| commit | 38fd8323e43f4b13e8bdc9d62b85ca1ed524a3f8 (patch) | |
| tree | 335eecee026317ef5699bf6f0a0da7104cffed7b /.opencode/plugins/superpowers.js | |
| parent | 80b085cfb36c0dfe5f6740a3a4764d16429a8228 (diff) | |
| parent | 587f04636d67a32d2edf65550085cdf2d70260a4 (diff) | |
Merge dev into the OpenCode compaction bootstrap fixfix/2391-opencode-compaction-bootstrap
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
Diffstat (limited to '.opencode/plugins/superpowers.js')
| -rw-r--r-- | .opencode/plugins/superpowers.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.opencode/plugins/superpowers.js b/.opencode/plugins/superpowers.js index 9659e80..d39c1ec 100644 --- a/.opencode/plugins/superpowers.js +++ b/.opencode/plugins/superpowers.js @@ -79,7 +79,7 @@ export const V1_MAPPING = `**Tool Mapping for OpenCode:** When skills request actions, substitute OpenCode equivalents: - Create or update todos → \`todowrite\` - \`Subagent (general-purpose):\` → \`task\` with \`subagent_type: "general"\` -- Invoke a skill → OpenCode's native \`skill\` tool +- Invoke a skill → OpenCode's native \`skill\` tool. Skill ids are bare names, so drop the \`superpowers:\` prefix skills use when they name each other (\`superpowers:brainstorming\` → \`skill\` with \`name: "brainstorming"\`) - Read files → \`read\` - Create, edit, or delete files → \`apply_patch\` - Run shell commands → \`bash\` @@ -97,7 +97,7 @@ export const V2_MAPPING = `**Tool Mapping for OpenCode:** When skills request actions, substitute OpenCode equivalents: - Create or update todos → OpenCode v2 has no todo tool; track the plan in a markdown file (or the harness's plan facility) instead - \`Subagent (general-purpose):\` → \`subagent\` with \`agent: "general"\` (give it \`description\` and \`prompt\`, optionally \`background\`; pass \`sessionID\` to continue a previous subagent) -- Invoke a skill → OpenCode's native \`skill\` tool +- Invoke a skill → OpenCode's native \`skill\` tool. Skill ids are bare names, so drop the \`superpowers:\` prefix skills use when they name each other (\`superpowers:brainstorming\` → \`skill\` with \`id: "brainstorming"\`) - Read files → \`read\` - Create, edit, or delete files → use \`patch\` with \`patchText\` when available; otherwise use \`write\` to create or overwrite files, \`edit\` for targeted changes, and \`shell\` for deletion - Run shell commands → \`shell\` (\`command\`, \`workdir\`, \`timeout\`, \`background\`) @@ -113,6 +113,11 @@ Use OpenCode's native \`skill\` tool to list and load skills.`; // regex work on every agent step. See #1202 for the full analysis. const _bootstrapCache = new Map(); // mapping -> bootstrap (null = file missing) +// Opening of every injected bootstrap part. The already-injected guards match +// it at the start of a part, so a prompt that merely mentions the tag (#2197) +// is not mistaken for the bootstrap. +const BOOTSTRAP_MARKER = '<EXTREMELY_IMPORTANT>\nYou have superpowers.'; + // Helper to generate bootstrap content (cached after first call per mapping) const getBootstrapContent = (toolMapping) => { // Return cached result on subsequent calls @@ -128,8 +133,7 @@ const getBootstrapContent = (toolMapping) => { const fullContent = fs.readFileSync(skillPath, 'utf8'); const { content } = extractAndStripFrontmatter(fullContent); - _bootstrapCache.set(toolMapping, `<EXTREMELY_IMPORTANT> -You have superpowers. + _bootstrapCache.set(toolMapping, `${BOOTSTRAP_MARKER} **IMPORTANT: The using-superpowers skill content is included below. It is ALREADY LOADED - you are currently following it. Do NOT use the skill tool to load "using-superpowers" again - that would be redundant.** @@ -249,7 +253,7 @@ export const SuperpowersPlugin = async ({ client, directory }) => { if (!firstUser || !firstUser.parts.length) return; // Guard: skip if first user message already contains bootstrap. - if (firstUser.parts.some(p => p.type === 'text' && p.text.includes('EXTREMELY_IMPORTANT'))) return; + if (firstUser.parts.some(p => p.type === 'text' && p.text.startsWith(BOOTSTRAP_MARKER))) return; // #2160: never restart the controller workflow inside task subagent // (child) sessions. V1 passes no input to this hook (verified in the @@ -356,7 +360,7 @@ async function setup(ctx) { if (!bootstrap || !event.messages || !event.messages.length) return; const firstUser = event.messages.find(m => m.role === 'user'); if (firstUser && (!firstUser.content || !firstUser.content.length)) return; - if (firstUser?.content.some(p => p.type === 'text' && p.text && p.text.includes('EXTREMELY_IMPORTANT'))) return; + if (firstUser?.content.some(p => p.type === 'text' && p.text && p.text.startsWith(BOOTSTRAP_MARKER))) return; // #2160: the request event carries the sessionID directly. Skip the // controller bootstrap when this prompt belongs to a task subagent |
