chore(upstream): re-pin obra d884ae0 + Reasonix dce3b3a7 (non-breaking drift)#5
Merged
Merged
Conversation
…g drift)
obra 896224c4 -> d884ae04 (skills/):
- using-superpowers/* cleanup (retired locally — no port action)
- executing-plans + writing-skills: drop Gemini CLI mentions
(our ports already reference native task/wait/review, not Gemini)
- brainstorming/visual-companion.md: drop Gemini section
(not shipped in this port)
Reasonix f2a475a2 -> dce3b3a70 (watched contract paths):
- internal/skill: +5 optional frontmatter keys (triggers,
negative-triggers, auto-use, needs-fresh-data, cost); grapheme
clipping for the 130-char index line
- internal/tool/builtin: +additive tools (read_only_skill,
read_only_task, complete_step, delete_range, delete_symbol,
move_file, code_index); refactor-only changes to bash/webfetch/
glob/editfile/multiedit/readfile/writefile — names unchanged
- run_skill: fork_from schema field removed; runtime enforces
continue_from/fork_from mutual exclusivity (we use neither)
- register of every tool our skills name (bash, edit_file,
multi_edit, read_file, write_file, glob, grep, ls, web_fetch,
todo_write, run_skill, read_skill, task, explore, review, wait)
unchanged at dce3b3a70
No skill re-port required. Structural bench: 11/11 pass.
Behavioral not re-run: nothing re-ported; BASELINE.json still stands.
Closes #4.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Addresses the upstream-drift issue (#4). Re-pins
UPSTREAM.jsonafter verifying both upstreams. No skill re-port required — this is a non-breaking re-pin.Drift classification
obra/superpowers —
896224c4 → d884ae04skills/using-superpowers/*(skill + 6 reference files) — heavy cleanupusing-superpowersis retired locally (seeUPSTREAM.jsonretired); changes stay confined to that skillskills/executing-plans/SKILL.md— dropped Gemini CLI from the subagent-platform listNoteto cite Reasonix's nativetask/wait/review, no Gemini mention existsskills/writing-skills/SKILL.md— dropped Gemini tool-ref linksPlatform spec → extending-reasonix, no Gemini links presentskills/brainstorming/visual-companion.md— dropped Gemini CLI run sectionvisual-companion.mdis not shipped in this portReasonix
main-v2—f2a475a2 → dce3b3a70internal/tool/*andinternal/skill/*. Verified it is non-breaking to our skills' surface:internal/skill: +5 optional frontmatter keys (triggers,negative-triggers,auto-use,needs-fresh-data,cost);clipRunes→ grapheme-cluster clipping for the 130-char index lineinternal/tool/builtin: +additive tools (read_only_skill,read_only_task,complete_step,delete_range,delete_symbol,move_file,code_index); refactor-only edits tobash/webfetch/glob/editfile/multiedit/readfile/writefiledce3b3a70. ✅run_skill:fork_fromschema field removed; runtime enforcescontinue_from/fork_frommutual exclusivitycontinue_fromnorfork_fromin any skill body. ✅read_only_skill(new plan-mode-safe entry point)run_skill/read_skill. ✅Confirmed the registry at
dce3b3a70still contains every tool/skill our port depends on:bash,edit_file,multi_edit,read_file,write_file,glob,grep,ls,web_fetch,todo_write,run_skill,read_skill,task,explore,review,wait.Bench-gate
node bench/structural.mjs— 11/11 skills pass (obra + our own)node bench/bench.mjsStage 2 (behavioral) — not re-run: no skill was re-ported, soBASELINE.jsonfrom the prior pin still stands and behavioral would only burn API budget testing an unchanged surface. Reasonix binary is not on PATH in this environment anyway.manifest.loadManifest).Changes
UPSTREAM.jsononly — pin bumps + date updates:obra.lastSyncedCommit:896224c4…→d884ae04…obra.lastSyncedDate: 2026-06-19 → 2026-07-06reasonix.lastVerifiedCommit:f2a475a2…→dce3b3a70…reasonix.lastVerifiedDate: 2026-06-22 → 2026-07-06Closes #4.