mirror of
https://github.com/obra/superpowers
synced 2026-08-07 10:14:12 +00:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 537d649ab3 | |||
| 5f8f500b1d | |||
| 707b155a38 | |||
| 3e1ecde38f | |||
| ffe22811bf | |||
| cfb310c69a | |||
| fdd1763d77 | |||
| af4bebf762 | |||
| 17b42c8128 | |||
| 1245282b05 | |||
| 6819b42d97 | |||
| 80b82abd8d | |||
| 538d65120b | |||
| 3ff8d15f15 | |||
| 1f0e2ab912 |
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"files": [
|
||||
{ "path": "package.json", "field": "version" },
|
||||
{ "path": ".hermes-plugin/plugin.yaml", "field": "version" },
|
||||
{ "path": ".claude-plugin/plugin.json", "field": "version" },
|
||||
{ "path": ".cursor-plugin/plugin.json", "field": "version" },
|
||||
{ "path": ".codex-plugin/plugin.json", "field": "version" },
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,304 @@
|
||||
# Hermes Version-Bump Wiring Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Keep the Hermes YAML manifest version synchronized with every other declared release manifest.
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-08-05-hermes-version-bump-wiring-design.md`
|
||||
|
||||
**Architecture:** Extend the existing release script with a small extension-based dispatcher: JSON continues through `jq`, while `.yaml` uses Mike Farah `yq` v4. Before the mutating bump loop, read every present manifest through that dispatcher so deterministic format or field failures occur before the first write.
|
||||
|
||||
**Tech Stack:** Bash 3.2-compatible shell, `jq`, Mike Farah `yq` v4, existing shell-lint tooling.
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- Support only `.json` and `.yaml`; `.yml` and other extensions remain unsupported.
|
||||
- YAML fields are present top-level strings; nested YAML fields are out of scope.
|
||||
- Pass the YAML field and new value through environment data, never interpolate either into a `yq` expression.
|
||||
- Keep `yq` confined to maintainer release tooling; do not add a plugin runtime dependency.
|
||||
- Preserve the existing missing-file behavior: `--check` reports missing files and a bump skips them.
|
||||
- Preflight only the mutating bump path; do not add rollback or transactional writes.
|
||||
- Do not change audit status behavior, version validation, or the existing JSON field-expression implementation.
|
||||
|
||||
---
|
||||
|
||||
## File Map
|
||||
|
||||
- Create: `tests/version-bump/test-bump-version.sh`
|
||||
- Exercise the real script in temporary JSON/YAML fixtures and check the real registry.
|
||||
- Modify: `scripts/bump-version.sh`
|
||||
- Add YAML read/write helpers, format dispatch, and bump-only read preflight.
|
||||
- Modify: `.version-bump.json`
|
||||
- Register `.hermes-plugin/plugin.yaml` at top-level field `version`.
|
||||
|
||||
### Task 1: Wire Hermes Into The Existing Version-Bump Script
|
||||
|
||||
**Files:**
|
||||
- Create: `tests/version-bump/test-bump-version.sh`
|
||||
- Modify: `scripts/bump-version.sh`
|
||||
- Modify: `.version-bump.json`
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `.version-bump.json` records shaped as `{ "path": string, "field": string }`.
|
||||
- Produces: `read_manifest_field FILE FIELD`, `write_manifest_field FILE FIELD VALUE`, and `preflight_manifests` Bash helpers.
|
||||
|
||||
- [ ] **Step 1: Fetch the current development base**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
git fetch origin dev
|
||||
```
|
||||
|
||||
Expected: command exits 0 and refreshes `origin/dev`.
|
||||
|
||||
- [ ] **Step 2: Rebase the task branch**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
git rebase origin/dev
|
||||
```
|
||||
|
||||
Expected: command exits 0, and `git status --short --branch` no longer reports the branch behind `origin/dev`.
|
||||
|
||||
- [ ] **Step 3: Add the initial failing behavioral test**
|
||||
|
||||
Create `tests/version-bump/test-bump-version.sh` with the happy-path fixture and real registry assertion:
|
||||
|
||||
```bash
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SCRIPT_SOURCE="$REPO_ROOT/scripts/bump-version.sh"
|
||||
TEST_ROOT="$(mktemp -d)"
|
||||
|
||||
cleanup() {
|
||||
rm -rf "$TEST_ROOT"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fail() {
|
||||
echo "FAIL: $*" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
make_fixture() {
|
||||
local repo="$1"
|
||||
local yaml_body="$2"
|
||||
|
||||
mkdir -p "$repo/scripts" "$repo/.hermes-plugin"
|
||||
cp "$SCRIPT_SOURCE" "$repo/scripts/bump-version.sh"
|
||||
cat >"$repo/.version-bump.json" <<'JSON'
|
||||
{
|
||||
"files": [
|
||||
{ "path": "package.json", "field": "version" },
|
||||
{ "path": ".hermes-plugin/plugin.yaml", "field": "version" }
|
||||
],
|
||||
"audit": { "exclude": [] }
|
||||
}
|
||||
JSON
|
||||
cat >"$repo/package.json" <<'JSON'
|
||||
{
|
||||
"name": "fixture",
|
||||
"version": "1.2.3"
|
||||
}
|
||||
JSON
|
||||
printf '%s\n' "$yaml_body" >"$repo/.hermes-plugin/plugin.yaml"
|
||||
}
|
||||
|
||||
happy_repo="$TEST_ROOT/happy"
|
||||
make_fixture "$happy_repo" $'name: superpowers\nversion: 1.2.3'
|
||||
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" --check >"$TEST_ROOT/check.out"
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" --audit >"$TEST_ROOT/audit.out"
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" 2.3.4 >"$TEST_ROOT/bump.out"
|
||||
|
||||
[[ "$(jq -r '.version' "$happy_repo/package.json")" == "2.3.4" ]] \
|
||||
|| fail "JSON manifest was not bumped"
|
||||
[[ "$(yq -r '.version' "$happy_repo/.hermes-plugin/plugin.yaml")" == "2.3.4" ]] \
|
||||
|| fail "YAML manifest was not bumped"
|
||||
|
||||
jq -e '
|
||||
any(.files[];
|
||||
.path == ".hermes-plugin/plugin.yaml" and .field == "version")
|
||||
' "$REPO_ROOT/.version-bump.json" >/dev/null \
|
||||
|| fail "Hermes manifest is not registered"
|
||||
|
||||
echo "Version-bump tests passed"
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Run the test to verify RED**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
/bin/bash tests/version-bump/test-bump-version.sh
|
||||
```
|
||||
|
||||
Expected: FAIL before `Version-bump tests passed`; the current JSON-only reader cannot process the YAML fixture.
|
||||
|
||||
- [ ] **Step 5: Add minimal YAML dispatch and register Hermes**
|
||||
|
||||
In `scripts/bump-version.sh`, add these helpers after `write_json_field`:
|
||||
|
||||
```bash
|
||||
require_tool() {
|
||||
command -v "$1" >/dev/null 2>&1 || {
|
||||
echo "error: required tool '$1' is not on PATH" >&2
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
||||
read_yaml_field() {
|
||||
local file="$1" field="$2"
|
||||
require_tool yq || return 1
|
||||
FIELD="$field" yq -er '.[strenv(FIELD)] | select(tag == "!!str")' "$file"
|
||||
}
|
||||
|
||||
write_yaml_field() {
|
||||
local file="$1" field="$2" value="$3"
|
||||
FIELD="$field" VALUE="$value" \
|
||||
yq -i '.[strenv(FIELD)] = strenv(VALUE)' "$file"
|
||||
}
|
||||
|
||||
read_manifest_field() {
|
||||
local file="$1"
|
||||
|
||||
case "$file" in
|
||||
*.json) read_json_field "$@" ;;
|
||||
*.yaml) read_yaml_field "$@" ;;
|
||||
*)
|
||||
echo "error: unsupported manifest format: $file" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
write_manifest_field() {
|
||||
local file="$1"
|
||||
|
||||
case "$file" in
|
||||
*.json) write_json_field "$@" ;;
|
||||
*.yaml) write_yaml_field "$@" ;;
|
||||
*)
|
||||
echo "error: unsupported manifest format: $file" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
```
|
||||
|
||||
Replace the three command-path calls to `read_json_field` with `read_manifest_field`, and replace the bump-path call to `write_json_field` with `write_manifest_field`.
|
||||
|
||||
Add this exact entry to `.version-bump.json` immediately after `package.json`:
|
||||
|
||||
```json
|
||||
{ "path": ".hermes-plugin/plugin.yaml", "field": "version" },
|
||||
```
|
||||
|
||||
- [ ] **Step 6: Run the initial test to verify GREEN**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
/bin/bash tests/version-bump/test-bump-version.sh
|
||||
```
|
||||
|
||||
Expected: PASS with `Version-bump tests passed`.
|
||||
|
||||
- [ ] **Step 7: Add the failing no-partial-write regression**
|
||||
|
||||
Insert this block before the final success message in `tests/version-bump/test-bump-version.sh`:
|
||||
|
||||
```bash
|
||||
invalid_repo="$TEST_ROOT/invalid"
|
||||
make_fixture "$invalid_repo" $'name: superpowers\nversion: 123'
|
||||
cp "$invalid_repo/package.json" "$TEST_ROOT/package.before"
|
||||
cp "$invalid_repo/.hermes-plugin/plugin.yaml" "$TEST_ROOT/plugin.before"
|
||||
|
||||
if /bin/bash "$invalid_repo/scripts/bump-version.sh" 2.3.4 \
|
||||
>"$TEST_ROOT/invalid.out" 2>&1; then
|
||||
fail "bump accepted a non-string YAML version"
|
||||
fi
|
||||
|
||||
cmp -s "$TEST_ROOT/package.before" "$invalid_repo/package.json" \
|
||||
|| fail "JSON manifest changed before YAML validation failed"
|
||||
cmp -s "$TEST_ROOT/plugin.before" "$invalid_repo/.hermes-plugin/plugin.yaml" \
|
||||
|| fail "invalid YAML manifest changed"
|
||||
```
|
||||
|
||||
- [ ] **Step 8: Run the regression to verify RED**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
/bin/bash tests/version-bump/test-bump-version.sh
|
||||
```
|
||||
|
||||
Expected: FAIL with `JSON manifest changed before YAML validation failed`; without preflight, the JSON manifest is written before the later YAML reader rejects its non-string version.
|
||||
|
||||
- [ ] **Step 9: Add the bump-only preflight**
|
||||
|
||||
Add this helper after `declared_files` in `scripts/bump-version.sh`:
|
||||
|
||||
```bash
|
||||
preflight_manifests() {
|
||||
local path field fullpath
|
||||
|
||||
require_tool jq || return 1
|
||||
while IFS=$'\t' read -r path field; do
|
||||
fullpath="$REPO_ROOT/$path"
|
||||
[[ -f "$fullpath" ]] || continue
|
||||
|
||||
if ! read_manifest_field "$fullpath" "$field" >/dev/null; then
|
||||
echo "error: cannot read declared manifest: $path ($field)" >&2
|
||||
return 1
|
||||
fi
|
||||
done < <(declared_files)
|
||||
}
|
||||
```
|
||||
|
||||
Call it in `cmd_bump` after version-format validation and before the first bump output or write:
|
||||
|
||||
```bash
|
||||
preflight_manifests
|
||||
|
||||
echo "Bumping all declared files to $new_version..."
|
||||
```
|
||||
|
||||
- [ ] **Step 10: Run focused verification**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
/bin/bash tests/version-bump/test-bump-version.sh
|
||||
scripts/lint-shell.sh scripts/bump-version.sh tests/version-bump/test-bump-version.sh
|
||||
scripts/bump-version.sh --check
|
||||
git diff --check
|
||||
```
|
||||
|
||||
Expected:
|
||||
|
||||
- The behavioral test prints `Version-bump tests passed`.
|
||||
- Shell lint reports both scripts with no errors.
|
||||
- `--check` lists eight declared manifests, including `.hermes-plugin/plugin.yaml`, all at `6.2.0`.
|
||||
- `git diff --check` prints nothing.
|
||||
|
||||
- [ ] **Step 11: Review and commit the implementation**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
git status --short
|
||||
git diff -- .version-bump.json scripts/bump-version.sh tests/version-bump/test-bump-version.sh
|
||||
git add .version-bump.json scripts/bump-version.sh tests/version-bump/test-bump-version.sh
|
||||
git commit \
|
||||
-m "fix(release): wire Hermes into version bumps" \
|
||||
-m "Register the Hermes YAML manifest alongside the existing JSON manifests. Route manifest reads and writes by extension through jq or Mike Farah yq v4, with field names and values passed as data." \
|
||||
-m "Preflight every present manifest before the mutating bump loop so a deterministic YAML read failure cannot leave earlier JSON manifests partially updated. Cover check, audit, bump, registry wiring, and byte-for-byte no-partial-write behavior with one focused fixture test."
|
||||
```
|
||||
|
||||
Expected: the commit succeeds with only the three implementation paths staged.
|
||||
@@ -0,0 +1,252 @@
|
||||
# Codex Efficiency Fixes — Design
|
||||
|
||||
Date: 2026-07-30
|
||||
Status: approved by Jesse (in-session)
|
||||
Branch: `codex-efficiency-fixes` off `dev`
|
||||
|
||||
## Sources
|
||||
|
||||
- Eval campaign closeout: `superpowers-autoresearch/reports/2026-07-codex-efficiency-campaign.md`
|
||||
(treatment table §4; every treatment below has a scorer and a measured
|
||||
`dev` baseline).
|
||||
- Codex source recon: `superpowers-autoresearch/docs/2026-07-29-codex-multiagent-v2-capabilities.md`
|
||||
(file:line citations against the Codex CLI source; grounds T2, T3, T5).
|
||||
- Published experiment write-ups: `superpowers-evals/docs/experiments/`.
|
||||
- Drew's spinout stack (PRs #2036, #2035) is **evidence, not adopted text**:
|
||||
Jesse wants to dig into those fixes in more detail before adopting any
|
||||
of them; they inform the problem statements only.
|
||||
|
||||
## Goal
|
||||
|
||||
Ship the five evidence-strong treatments from the codex-efficiency eval
|
||||
campaign as superpowers skill/doc changes, each graded against its
|
||||
pre-registered criterion by the campaign's scorers before its PR is cut.
|
||||
Phase 2 (everything else in the closeout treatment table) follows, each
|
||||
item gated on new baseline work first.
|
||||
|
||||
## Scope decisions (settled with Jesse)
|
||||
|
||||
- **Phase 1 = the evidence-strong five** (T1–T5 below). Phase 2 items
|
||||
each need a failing baseline before any fix ships (discrimination
|
||||
rule: inconclusive-by-zero is a stop).
|
||||
- **One branch, PR per treatment.** Development and batteries happen on
|
||||
`codex-efficiency-fixes`; when a treatment beats its criterion, it is
|
||||
cut into its own PR against `dev` with its eval evidence. No merge
|
||||
without Jesse's per-PR approval.
|
||||
- **T4 ships cross-harness with a global regression battery** (Claude
|
||||
Code, Codex, Gemini), variant C shape: ceremony scales, approval never
|
||||
does.
|
||||
|
||||
## The five treatments
|
||||
|
||||
### T1. SDD worker-review prohibition
|
||||
|
||||
**Evidence:** 9/9 depth-2 spawns across 4 corpora were implementer-issued
|
||||
reviewers; all 9 were same-task duplicates of the review the controller
|
||||
dispatches anyway. The dispatch contract never says review is not the
|
||||
worker's job; "self-review" in the implementer prompt gets reified into a
|
||||
reviewer subagent on harnesses where children can spawn (Codex).
|
||||
|
||||
**Changes:**
|
||||
- `skills/subagent-driven-development/implementer-prompt.md`: an explicit
|
||||
"You do not dispatch subagents" clause — self-review means reading your
|
||||
own diff; the controller owns all review dispatch; a reviewer you spawn
|
||||
duplicates a review the process already provides.
|
||||
- `skills/subagent-driven-development/SKILL.md`: one dispatch-contract
|
||||
line in the task loop, plus a Red Flags row: "An independent review
|
||||
would strengthen my report" → review is the controller's next step;
|
||||
your reviewer is a duplicate seat.
|
||||
- Harness-agnostic wording (no-op where children cannot spawn).
|
||||
|
||||
**Graded by:** `score_e6.py` (depth-2 spawns by spawner role, duplicate
|
||||
review families); `score_e5.py` for the same-scope variant.
|
||||
**Baseline:** 9/9 worker-issued, 0 counter-examples.
|
||||
**Criterion:** 0 worker-issued depth-2 spawns AND review coverage
|
||||
preserved (every task still gets exactly one controller-dispatched task
|
||||
review).
|
||||
|
||||
### T2. Event-driven waiting
|
||||
|
||||
**Evidence:** 60–78% of `wait_agent` calls time out in every corpus
|
||||
(dev 67.1%, spinout 60.2%). Source recon: V2 waits are event
|
||||
subscriptions, not polls — one long wait has the same wake latency as a
|
||||
10s poll at ~1/90th the calls; a completed child's FINAL_ANSWER is pushed
|
||||
into the parent's mailbox and drained into the next model request with no
|
||||
wait at all.
|
||||
|
||||
**Changes** (`skills/using-superpowers/references/codex-tools.md`):
|
||||
- Never short-timeout poll.
|
||||
- While local work remains, do not wait — child results arrive with your
|
||||
next turn via the mailbox.
|
||||
- When genuinely idle, issue ONE `wait_agent` with a long `timeout_ms`
|
||||
(900000+; harness max 3600000).
|
||||
- V2 caveat stated: completion mail carries `trigger_turn=false` and will
|
||||
not wake an idle controller — that is the one job `wait_agent` has.
|
||||
|
||||
**Graded by:** `score_e7.py` (timeout rate, inter-poll cadence,
|
||||
cache-rebill estimate — the rebill figure stays labeled as an estimate).
|
||||
**Baseline:** dev 67.1% timeout rate.
|
||||
**Criterion:** timeout rate < 25% with no loss of task completion.
|
||||
|
||||
### T3. codex-tools.md corrections
|
||||
|
||||
**Evidence:** five claims in the current guidance are contradicted by the
|
||||
Codex source (all file:line-cited in the capabilities doc):
|
||||
1. `close_agent` does not exist in multi-agent V2 (V1-only). V2 LRU-evicts
|
||||
finished children automatically; not closing costs nothing;
|
||||
`followup_task` transparently reloads an evicted child.
|
||||
2. Fix rounds can always resume the implementer via `followup_task` —
|
||||
dev's "if your harness cannot send another message to a spawned agent,
|
||||
dispatch each fix round as a fresh implementer" branch is dead on V2.
|
||||
3. Role files (`~/.codex/agents/**.toml`) DO attach to spawns via
|
||||
`agent_type` on isolated forks (0.145+).
|
||||
4. Full-history forks accept `model`/`reasoning_effort` overrides; only
|
||||
`agent_type` is refused. (Isolated forks remain the SDD guidance for
|
||||
context-hygiene reasons, stated accurately.)
|
||||
5. Dispatch guidance must never name non-V2 model presets — the V2 spawn
|
||||
allowlist is v2 presets only; others hard-error.
|
||||
|
||||
**Changes:** rewrite the multi-agent paragraph of
|
||||
`skills/using-superpowers/references/codex-tools.md` to be
|
||||
version-honest (V1 vs V2 behavior labeled where they differ).
|
||||
|
||||
**Graded by:** source citation (already verified); no scorer regressions
|
||||
on the shared battery. `score_e8.py` is retained as a V1/V2 schema
|
||||
detector, not a hygiene grader — no `close_agent` checklist ships.
|
||||
|
||||
### T4. Brainstorming three-path router (variant C: approval always)
|
||||
|
||||
**Evidence:** micro — the current HARD-GATE text pushes a bounded task to
|
||||
FULL ceremony 5/5, while Z-null (no guidance) and a three-path router
|
||||
both differentiate 5/5: the absolute wording suppresses discrimination
|
||||
the model draws natively. FULL battery — ceremony volume scales
|
||||
moderately (16.7 vs 24.0 tool calls, bounded vs arch), but the
|
||||
two-document ritual (spec file → plan file) ran unconditionally in every
|
||||
rep. The measured waste is the unconditional artifact ritual, not the
|
||||
approval gate.
|
||||
|
||||
**Design (variant C):** three paths scale the ARTIFACT; every path keeps
|
||||
human approval before implementation:
|
||||
- **Spike** (feasibility question, explicitly throwaway): present the
|
||||
question and the intended probe in 2–3 sentences, get a nod, go. No
|
||||
docs. Findings return as a recommendation; anything built stays labeled
|
||||
throwaway.
|
||||
- **Bounded** (well-scoped change to an existing, understood flow):
|
||||
present a short design in chat, get approval, implement. No spec file,
|
||||
no writing-plans invocation.
|
||||
- **Architectural** (restructures components, new subsystem, public
|
||||
interface change): the full current flow — spec doc, review,
|
||||
writing-plans.
|
||||
|
||||
**Guards (all ship with the router):**
|
||||
- Classification is said out loud ("this looks bounded, so I'll present a
|
||||
short design here rather than write a spec") so the human can override.
|
||||
- When in doubt between two paths, take the heavier one.
|
||||
- One-way ratchet: hidden complexity discovered mid-path upgrades the
|
||||
path; never downgrade mid-task.
|
||||
- New Red Flags rows targeting classification-as-escape-hatch ("I'll call
|
||||
it bounded to skip the doc").
|
||||
|
||||
**Changes** (`skills/brainstorming/SKILL.md`): HARD-GATE keeps "no
|
||||
implementation before approval" and drops "regardless of perceived
|
||||
simplicity" as the ceremony driver; anti-pattern section reframed (the
|
||||
sin is skipping approval, not skipping documents); checklist steps 6–9
|
||||
become the architectural path; process-flow graph gains the router; Red
|
||||
Flags rows added. This is carefully-tuned content — the edit follows
|
||||
writing-skills methodology and ships only with the full eval evidence
|
||||
below.
|
||||
|
||||
**Graded by (three layers):**
|
||||
1. **Micro** (`ceremony-path-micro.py`, adapted): variant C literal text,
|
||||
plus adversarially ambiguous briefs the campaign never tested (a task
|
||||
that pattern-matches bounded but hides a public interface change).
|
||||
Criteria: spike/bounded/arch differentiate (≥4/5 per cell); ambiguous
|
||||
briefs escalate to FULL (≥4/5); arch never downgrades (5/5).
|
||||
2. **Codex ceremony battery:** `cx-ceremony-{spike,bounded,arch}` on the
|
||||
fix arm, 3 reps each, `score_e4.py` census. Criteria: bounded reps
|
||||
show an approval turn but zero committed spec files and zero
|
||||
writing-plans ritual; arch reps keep the full two-doc flow; spike reps
|
||||
stay minimal.
|
||||
3. **Global regression battery:** the same three ceremony scenarios on
|
||||
Claude Code and Gemini (rig work: those scenarios are currently
|
||||
codex-gated), 3 reps each; plus the triggering acceptance check
|
||||
("Let's make a react todo list" auto-triggers brainstorming into the
|
||||
full/architectural path) on all three harnesses.
|
||||
|
||||
### T5. Explicit model on child-issued spawns
|
||||
|
||||
**Evidence:** root spawns are 100% explicit-model at CLI 0.146 (dev
|
||||
14/14); the live gap is depth-2 — 2/2 child-issued spawns omitted
|
||||
`model`. Source recon: `model` without `reasoning_effort` resets effort
|
||||
to the MODEL's default, not the parent's.
|
||||
|
||||
**Changes** (`skills/using-superpowers/references/codex-tools.md`):
|
||||
- Every spawn you issue — including as a child — sets `model` AND
|
||||
`reasoning_effort`; the effort-reset trap is named.
|
||||
- Advise `[agents].default_subagent_model` and
|
||||
`[agents].default_subagent_reasoning_effort` in `~/.codex/config.toml`
|
||||
as the machine-level backstop for anything that slips through.
|
||||
|
||||
**Graded by:** `score_e1.py` (per-spawn explicit-model rate, by depth) on
|
||||
the shared battery.
|
||||
**Baseline:** depth-2: 0/2 explicit.
|
||||
**Criterion:** every spawn at every depth carries explicit model +
|
||||
effort. Pre-registered caveat: if T1 eliminates depth-2 spawns entirely,
|
||||
T5 grades as root-spawn regression (hold 100%) plus doc correctness and
|
||||
is recorded inconclusive-by-zero at depth-2 — the config backstop is then
|
||||
the operative mechanism.
|
||||
|
||||
## Grading plan
|
||||
|
||||
- **Shared SDD battery** carries T1, T2, T5: `cx-sdd-small`, fix-branch
|
||||
arm (`/tmp/sp-arm-fix`), 8 reps across both container lanes. Dev
|
||||
baselines are already measured; no baseline re-runs.
|
||||
- **T4 batteries** as listed above (micro + codex ceremony + global
|
||||
regression).
|
||||
- **Pre-registration:** every battery gets a hypothesis-log entry
|
||||
(prediction, scorer, criterion) in
|
||||
`superpowers-autoresearch/logs/2026-07-30-codex-efficiency-fixes.md`
|
||||
BEFORE it runs. Standing rules carry over: append-only log, manual
|
||||
inspection of scorer matches on fix-arm runs (non-circular
|
||||
verification), no raw rollouts committed, correctness rides beside
|
||||
cost in every verdict.
|
||||
- **Attribution:** orthogonal scorers on one combined branch; unexpected
|
||||
regressions bisect by treatment commit.
|
||||
- **Budget:** shared battery ~$40, codex ceremony ~$40, global
|
||||
regression ~$40–80, micros ~$5 → phase 1 ≈ $150–200 of the ~$850
|
||||
remaining from the campaign's $1000.
|
||||
|
||||
## Process
|
||||
|
||||
- Work happens in the `codex-efficiency-fixes` worktree (branched off
|
||||
`dev`); execution via subagent-driven-development from a written plan.
|
||||
- Skill-text changes follow writing-skills methodology.
|
||||
- Scenario/rig changes (un-gating ceremony scenarios for Claude
|
||||
Code/Gemini, adversarial micro briefs) land in `superpowers-evals`
|
||||
main, as authorized.
|
||||
- PR-per-treatment against `dev`, each with its eval evidence and the
|
||||
standard identification block; merges only on Jesse's per-PR approval.
|
||||
|
||||
## Phase 2 queue (baseline-first; not in this plan's tasks)
|
||||
|
||||
Each item requires a failing baseline before any fix ships:
|
||||
1. **Dispatch routing / long-session drift** — needs a long-session
|
||||
elicitation rig (fresh sessions don't reproduce the pathology at CLI
|
||||
0.146). Drew's stack informs the treatment shape.
|
||||
2. **Verification leases / evidence receipts** — needs the
|
||||
substring-aware duplicate counter added to `score_e3.py` first
|
||||
(current baseline 1/23 exact-string pairs is too weak).
|
||||
3. **Remediation cap** — small-n baseline (2/3 reps) needs more reps.
|
||||
4. **Cross-task-race probe redesign** — `score_e5.py`'s probe is
|
||||
inconclusive-by-zero by design tradeoff; needs a stronger probe.
|
||||
5. **E5 D4 shell-command parser** — fix-review-scope classifier cannot
|
||||
parse compound commands; scorer work, not skill work.
|
||||
|
||||
## Out of scope
|
||||
|
||||
- Adopting Drew's spinout stack (#2036/#2035) or its text.
|
||||
- RoboRev, Codex token telemetry (separate codebases).
|
||||
- A `close_agent` hygiene checklist (V2 has no such tool — closed as
|
||||
do-not-ship in the campaign).
|
||||
- Claude Code/Gemini-specific efficiency treatments beyond the T4
|
||||
regression battery.
|
||||
@@ -0,0 +1,56 @@
|
||||
# Hermes Version-Bump Wiring Design
|
||||
|
||||
**Date:** 2026-08-05
|
||||
**Revised:** 2026-08-06
|
||||
**Status:** Approved
|
||||
|
||||
## Goal
|
||||
|
||||
Keep `.hermes-plugin/plugin.yaml` in lockstep with the repository version by
|
||||
registering it in `.version-bump.json` and teaching `scripts/bump-version.sh`
|
||||
to process YAML without implementing a YAML parser in Bash.
|
||||
|
||||
## Design
|
||||
|
||||
- Add `{ "path": ".hermes-plugin/plugin.yaml", "field": "version" }` to
|
||||
`.version-bump.json`.
|
||||
- Route `.json` through the existing `jq` helpers and `.yaml` through Mike
|
||||
Farah `yq` v4. The YAML key and value are passed as data, not interpolated
|
||||
into the expression.
|
||||
- Support only a present top-level YAML string field. Nested fields and `.yml`
|
||||
are out of scope.
|
||||
- Route `--check`, `--audit`, and version updates through the same small
|
||||
read/write dispatcher.
|
||||
- Before a version bump writes any manifest, run one read-only preflight that
|
||||
validates the required tools and reads every present declared manifest
|
||||
through the dispatcher. This prevents a deterministic YAML failure from
|
||||
occurring after earlier JSON files have already been updated. Missing-file
|
||||
behavior remains unchanged, and `--help` still works without `jq` or `yq`.
|
||||
|
||||
The preflight is the only reliability addition. It does not make the script
|
||||
transactional or redesign its existing audit and error-status behavior.
|
||||
|
||||
## Tests
|
||||
|
||||
Three focused behavioral tests run the real script against an isolated
|
||||
temporary fixture and prove:
|
||||
|
||||
- aligned JSON and YAML pass `--check` and `--audit`, and a bump updates both
|
||||
formats;
|
||||
- an actual bump with JSON declared first and a later YAML manifest whose
|
||||
top-level `version` is not a string exits nonzero and leaves every manifest
|
||||
byte-for-byte unchanged; and
|
||||
- the real `.version-bump.json` registers the Hermes manifest.
|
||||
|
||||
Verification also runs shell lint and `scripts/bump-version.sh --check` against
|
||||
the repository.
|
||||
|
||||
## Non-Goals
|
||||
|
||||
- No hand-written YAML parser.
|
||||
- No `.yml` or nested-YAML support.
|
||||
- No Hermes runtime changes.
|
||||
- No rollback framework, general config-schema layer, audit/status refactor, or
|
||||
exhaustive failure matrix.
|
||||
- No change to the separate version-validation and JSON-expression issue found
|
||||
during review.
|
||||
+66
-4
@@ -40,12 +40,72 @@ write_json_field() {
|
||||
jq "$jq_path = \"$value\"" "$file" > "$tmp" && mv "$tmp" "$file"
|
||||
}
|
||||
|
||||
require_tool() {
|
||||
command -v "$1" >/dev/null 2>&1 || {
|
||||
echo "error: required tool '$1' is not on PATH" >&2
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
||||
read_yaml_field() {
|
||||
local file="$1" field="$2"
|
||||
require_tool yq || return 1
|
||||
FIELD="$field" yq -er '.[strenv(FIELD)] | select(tag == "!!str")' "$file"
|
||||
}
|
||||
|
||||
write_yaml_field() {
|
||||
local file="$1" field="$2" value="$3"
|
||||
FIELD="$field" VALUE="$value" \
|
||||
yq -i '.[strenv(FIELD)] = strenv(VALUE)' "$file"
|
||||
}
|
||||
|
||||
read_manifest_field() {
|
||||
local file="$1"
|
||||
|
||||
case "$file" in
|
||||
*.json) read_json_field "$@" ;;
|
||||
*.yaml) read_yaml_field "$@" ;;
|
||||
*)
|
||||
echo "error: unsupported manifest format: $file" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
write_manifest_field() {
|
||||
local file="$1"
|
||||
|
||||
case "$file" in
|
||||
*.json) write_json_field "$@" ;;
|
||||
*.yaml) write_yaml_field "$@" ;;
|
||||
*)
|
||||
echo "error: unsupported manifest format: $file" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Read the list of declared files from config.
|
||||
# Outputs lines of "path<TAB>field"
|
||||
declared_files() {
|
||||
jq -r '.files[] | "\(.path)\t\(.field)"' "$CONFIG"
|
||||
}
|
||||
|
||||
preflight_manifests() {
|
||||
local path field fullpath
|
||||
|
||||
require_tool jq || return 1
|
||||
while IFS=$'\t' read -r path field; do
|
||||
fullpath="$REPO_ROOT/$path"
|
||||
[[ -f "$fullpath" ]] || continue
|
||||
|
||||
if ! read_manifest_field "$fullpath" "$field" >/dev/null; then
|
||||
echo "error: cannot read declared manifest: $path ($field)" >&2
|
||||
return 1
|
||||
fi
|
||||
done < <(declared_files)
|
||||
}
|
||||
|
||||
# Read the audit exclude patterns from config.
|
||||
audit_excludes() {
|
||||
jq -r '.audit.exclude[]' "$CONFIG" 2>/dev/null
|
||||
@@ -68,7 +128,7 @@ cmd_check() {
|
||||
continue
|
||||
fi
|
||||
local ver
|
||||
ver=$(read_json_field "$fullpath" "$field")
|
||||
ver=$(read_manifest_field "$fullpath" "$field")
|
||||
printf " %-45s %s\n" "$path ($field)" "$ver"
|
||||
versions+=("$ver")
|
||||
done < <(declared_files)
|
||||
@@ -101,7 +161,7 @@ cmd_audit() {
|
||||
current_version=$(
|
||||
while IFS=$'\t' read -r path field; do
|
||||
local fullpath="$REPO_ROOT/$path"
|
||||
[[ -f "$fullpath" ]] && read_json_field "$fullpath" "$field"
|
||||
[[ -f "$fullpath" ]] && read_manifest_field "$fullpath" "$field"
|
||||
done < <(declared_files) | sort | uniq -c | sort -rn | head -1 | awk '{print $2}'
|
||||
)
|
||||
|
||||
@@ -172,6 +232,8 @@ cmd_bump() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
preflight_manifests
|
||||
|
||||
echo "Bumping all declared files to $new_version..."
|
||||
echo ""
|
||||
|
||||
@@ -182,8 +244,8 @@ cmd_bump() {
|
||||
continue
|
||||
fi
|
||||
local old_ver
|
||||
old_ver=$(read_json_field "$fullpath" "$field")
|
||||
write_json_field "$fullpath" "$field" "$new_version"
|
||||
old_ver=$(read_manifest_field "$fullpath" "$field")
|
||||
write_manifest_field "$fullpath" "$field" "$new_version"
|
||||
printf " %-45s %s -> %s\n" "$path ($field)" "$old_ver" "$new_version"
|
||||
done < <(declared_files)
|
||||
|
||||
|
||||
@@ -85,6 +85,7 @@ digraph brainstorming {
|
||||
- Scale each section to its complexity: a few sentences if straightforward, up to 200-300 words if nuanced
|
||||
- Ask after each section whether it looks right so far
|
||||
- Cover: architecture, components, data flow, error handling, testing
|
||||
- For a new project (or one with no configured tooling), the design presentation includes a short tooling question alongside the architecture: which of these to set up from the start — cheapest before any code exists: aggressive linting + auto-formatting (the stack's standard, e.g. ruff+format / eslint+prettier / clippy+rustfmt); unit-test infrastructure (runner, layout, a first passing fixture); end-to-end test infrastructure; fuzz or mutation testing where the stack supports it. The user's selections land in the spec's Global Constraints so every later plan and task inherits them.
|
||||
- Be ready to go back and clarify if something doesn't make sense
|
||||
|
||||
**Design for isolation and clarity:**
|
||||
|
||||
@@ -174,6 +174,29 @@ git worktree remove "$WORKTREE_PATH"
|
||||
git worktree prune # Self-healing: clean up any stale registrations
|
||||
```
|
||||
|
||||
**If removal is refused** (`contains modified or untracked files`): the
|
||||
worktree holds files that exist nowhere else — uncommitted plans, notes,
|
||||
or scratch work. Never `--force` on your own initiative. Show your human
|
||||
partner what is at stake and ask:
|
||||
|
||||
```bash
|
||||
git -C "$WORKTREE_PATH" status --porcelain -uall
|
||||
```
|
||||
|
||||
```
|
||||
Worktree removal refused — these files were never committed:
|
||||
|
||||
<file list>
|
||||
|
||||
1. Commit them to <branch> before cleanup
|
||||
2. Move them into <main repo root>
|
||||
3. Delete them (unrecoverable)
|
||||
|
||||
Which?
|
||||
```
|
||||
|
||||
Carry out the choice, then remove the worktree.
|
||||
|
||||
**Otherwise:** The host environment owns this workspace — leave it in
|
||||
place. If your platform provides a workspace-exit tool, use it.
|
||||
|
||||
@@ -196,6 +219,7 @@ place. If your platform provides a workspace-exit tool, use it.
|
||||
| "'Yeah, get rid of it' counts as confirmation" | Only the typed word `discard` authorizes deletion. |
|
||||
| "The PR is up, so the worktree is clutter now" | PR feedback gets fixed in that worktree. It stays until the work lands. |
|
||||
| "This other worktree looks stale — I'll clean it too" | Clean up only worktrees under `.worktrees/` or `worktrees/`. Everything else belongs to the host. |
|
||||
| "Removal refused — `--force` is just finishing the cleanup" | The refusal means files exist only in that worktree. `--force` destroys them permanently. Show your human partner and ask. |
|
||||
| "The merged-result failure is probably flaky" | A failing merged result stops everything. Branch and worktree stay put while you investigate. |
|
||||
| "The base branch is obviously main" | Confirm the fork point or ask. Merging into the wrong base is expensive to undo. |
|
||||
| "The push was rejected — force-push will fix it" | A rejected push means the remote moved. Investigate; force-push only on your human partner's explicit request. |
|
||||
|
||||
@@ -154,7 +154,10 @@ a ledger file, not only in todos.
|
||||
that happens, recover from `git log`.
|
||||
|
||||
Read the plan once, note its context and Global Constraints, and create a
|
||||
todo per task.
|
||||
todo per task. If the plan names a Spec, read that too: the spec is the
|
||||
authority the plan argues from, and conflicts inside the plan resolve
|
||||
against it. A plan with no reachable spec gets a ledger note saying so —
|
||||
rulings made without one are provisional.
|
||||
|
||||
Before dispatching Task 1, scan the plan once for conflicts, writing down
|
||||
what you checked as you check it:
|
||||
|
||||
@@ -84,6 +84,13 @@ Subagent (general-purpose):
|
||||
Warnings or other noise in the implementer's reported test output are
|
||||
findings — test output should be pristine.
|
||||
|
||||
Evidence you cannot see is not evidence that doesn't exist. If the
|
||||
report or its test evidence looks truncated, or you cannot locate the
|
||||
results it claims, re-read the file at its stated path — and if it is
|
||||
genuinely missing or garbled, report that as a gap for the controller.
|
||||
Re-running the suite to regenerate what you failed to read is not
|
||||
verification; illegibility of the evidence is not invalidation of it.
|
||||
|
||||
## Part 1: Spec Compliance
|
||||
|
||||
Compare the diff against What Was Requested:
|
||||
|
||||
@@ -66,6 +66,9 @@ independently testable deliverable.
|
||||
|
||||
**Tech Stack:** [Key technologies/libraries]
|
||||
|
||||
**Spec:** [path to the spec/design doc this plan implements — the plan
|
||||
argues from the spec, so the spec travels with it; executors read both]
|
||||
|
||||
## Global Constraints
|
||||
|
||||
[The spec's project-wide requirements — version floors, dependency limits,
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SCRIPT_SOURCE="$REPO_ROOT/scripts/bump-version.sh"
|
||||
TEST_ROOT="$(mktemp -d)"
|
||||
|
||||
cleanup() {
|
||||
rm -rf "$TEST_ROOT"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fail() {
|
||||
echo "FAIL: $*" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
make_fixture() {
|
||||
local repo="$1"
|
||||
local yaml_body="$2"
|
||||
|
||||
mkdir -p "$repo/scripts" "$repo/.hermes-plugin"
|
||||
cp "$SCRIPT_SOURCE" "$repo/scripts/bump-version.sh"
|
||||
cat >"$repo/.version-bump.json" <<'JSON'
|
||||
{
|
||||
"files": [
|
||||
{ "path": "package.json", "field": "version" },
|
||||
{ "path": ".hermes-plugin/plugin.yaml", "field": "version" }
|
||||
],
|
||||
"audit": { "exclude": [] }
|
||||
}
|
||||
JSON
|
||||
cat >"$repo/package.json" <<'JSON'
|
||||
{
|
||||
"name": "fixture",
|
||||
"version": "1.2.3"
|
||||
}
|
||||
JSON
|
||||
printf '%s\n' "$yaml_body" >"$repo/.hermes-plugin/plugin.yaml"
|
||||
}
|
||||
|
||||
happy_repo="$TEST_ROOT/happy"
|
||||
make_fixture "$happy_repo" $'name: superpowers\nversion: 1.2.3'
|
||||
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" --check >"$TEST_ROOT/check.out"
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" --audit >"$TEST_ROOT/audit.out"
|
||||
/bin/bash "$happy_repo/scripts/bump-version.sh" 2.3.4 >"$TEST_ROOT/bump.out"
|
||||
|
||||
[[ "$(jq -r '.version' "$happy_repo/package.json")" == "2.3.4" ]] \
|
||||
|| fail "JSON manifest was not bumped"
|
||||
[[ "$(yq -r '.version' "$happy_repo/.hermes-plugin/plugin.yaml")" == "2.3.4" ]] \
|
||||
|| fail "YAML manifest was not bumped"
|
||||
|
||||
jq -e '
|
||||
any(.files[];
|
||||
.path == ".hermes-plugin/plugin.yaml" and .field == "version")
|
||||
' "$REPO_ROOT/.version-bump.json" >/dev/null \
|
||||
|| fail "Hermes manifest is not registered"
|
||||
|
||||
invalid_repo="$TEST_ROOT/invalid"
|
||||
make_fixture "$invalid_repo" $'name: superpowers\nversion: 123'
|
||||
cp "$invalid_repo/package.json" "$TEST_ROOT/package.before"
|
||||
cp "$invalid_repo/.hermes-plugin/plugin.yaml" "$TEST_ROOT/plugin.before"
|
||||
|
||||
if /bin/bash "$invalid_repo/scripts/bump-version.sh" 2.3.4 \
|
||||
>"$TEST_ROOT/invalid.out" 2>&1; then
|
||||
fail "bump accepted a non-string YAML version"
|
||||
fi
|
||||
|
||||
cmp -s "$TEST_ROOT/package.before" "$invalid_repo/package.json" \
|
||||
|| fail "JSON manifest changed before YAML validation failed"
|
||||
cmp -s "$TEST_ROOT/plugin.before" "$invalid_repo/.hermes-plugin/plugin.yaml" \
|
||||
|| fail "invalid YAML manifest changed"
|
||||
|
||||
echo "Version-bump tests passed"
|
||||
Reference in New Issue
Block a user