Skip to content

chore(upstream): re-pin obra d884ae0 + Reasonix dce3b3a7 (non-breaking drift)#5

Merged
christopherarter merged 1 commit into
mainfrom
sync/upstream-2026-07-06
Jul 6, 2026
Merged

chore(upstream): re-pin obra d884ae0 + Reasonix dce3b3a7 (non-breaking drift)#5
christopherarter merged 1 commit into
mainfrom
sync/upstream-2026-07-06

Conversation

@christopherarter

Copy link
Copy Markdown
Owner

Summary

Addresses the upstream-drift issue (#4). Re-pins UPSTREAM.json after verifying both upstreams. No skill re-port required — this is a non-breaking re-pin.

Drift classification

obra/superpowers — 896224c4 → d884ae04

Upstream change Port action
skills/using-superpowers/* (skill + 6 reference files) — heavy cleanup Noneusing-superpowers is retired locally (see UPSTREAM.json retired); changes stay confined to that skill
skills/executing-plans/SKILL.md — dropped Gemini CLI from the subagent-platform list None — our port already rewrote that Note to cite Reasonix's native task/wait/review, no Gemini mention exists
skills/writing-skills/SKILL.md — dropped Gemini tool-ref links None — our port phrases the line as Platform spec → extending-reasonix, no Gemini links present
skills/brainstorming/visual-companion.md — dropped Gemini CLI run section Nonevisual-companion.md is not shipped in this port

Reasonix main-v2f2a475a2 → dce3b3a70

⚠️ The PR message's claim of "no watched contract files changed" is inaccurate — substantial churn hit internal/tool/* and internal/skill/*. Verified it is non-breaking to our skills' surface:

Contract change Impact on ported skills
internal/skill: +5 optional frontmatter keys (triggers, negative-triggers, auto-use, needs-fresh-data, cost); clipRunes → grapheme-cluster clipping for the 130-char index line Optional metadata; our skill descriptions already front-load. ✅
internal/tool/builtin: +additive tools (read_only_skill, read_only_task, complete_step, delete_range, delete_symbol, move_file, code_index); refactor-only edits to bash/webfetch/glob/editfile/multiedit/readfile/writefile Additive; every built-in tool name our skills name is unchanged at dce3b3a70. ✅
run_skill: fork_from schema field removed; runtime enforces continue_from/fork_from mutual exclusivity We use neither continue_from nor fork_from in any skill body. ✅
read_only_skill (new plan-mode-safe entry point) Additive; skills still cite run_skill/read_skill. ✅

Confirmed the registry at dce3b3a70 still 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.mjs11/11 skills pass (obra + our own)
  • ⏭️ node bench/bench.mjs Stage 2 (behavioral) — not re-run: no skill was re-ported, so BASELINE.json from 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 loads at the new pins (manifest.loadManifest).

Changes

UPSTREAM.json only — pin bumps + date updates:

  • obra.lastSyncedCommit: 896224c4…d884ae04…
  • obra.lastSyncedDate: 2026-06-19 → 2026-07-06
  • reasonix.lastVerifiedCommit: f2a475a2…dce3b3a70…
  • reasonix.lastVerifiedDate: 2026-06-22 → 2026-07-06

Closes #4.

…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.
@christopherarter
christopherarter merged commit 1a531df into main Jul 6, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upstream drift: superpowers + Reasonix

1 participant