Skip to content

chore: post-merge cleanup for #302 nits - #306

Merged
regnull merged 1 commit into
mainfrom
chore/skills-cleanup-nits
Oct 18, 2026
Merged

regnull merged 1 commit into
mainfrom
chore/skills-cleanup-nits

Conversation

@regnull

@regnull regnull commented Oct 18, 2026

Copy link
Copy Markdown
Owner

Summary

Post-merge cleanup for the three non-blocking reviewer carry-forward nits on #302 (issue #252, skills feature). No functional changes — tests, a docstring, and blank lines only.

Changes

  1. Vacuous assertion fixed — backend/tests/test_skills.py::test_workspace_roots_shadow_the_state_dir asserted skills.id != "Deep Review", but ids are directory names and "deep" != "Deep Review" is always true — the test could never fail. Replaced with a real assertion of the shadowing behavior:

    # Same id in both roots: exactly one skill survives and it comes from the
    # workspace root ("Deep Review" here), not the shadowed state-dir copy
    # ("Git Rebasing").
    assert skills.name == "Deep Review"

    (discover_skills dedupes with seen.setdefault, so the first root — the workspace — wins; sharpening the assertion actually confirmed this ordering empirically.)

  2. Stale migration docstring — backend/openbot/db/migrations/versions/0022_bot_skill_names.py said Revision ID: 0021 / Revises: 0020 in its docstring while the module constants correctly read revision = "0022", down_revision = "0021". Docstring updated to match what the migration actually does.

  3. Cosmetic blank-line restoration — backend/openbot/seed.py: the feat: skills — SKILL.md files loaded on demand (#252) #302 commit dropped two PEP 8 blank lines around SCRATCHPAD_GRANT_DONE_KEY and before sync_demo_bots while extending SYNCED_FIELDS; restored.

Testing

  • uv run pytest -q: 833 passed, 30 deselected (same as main).
  • uv run ruff check .: clean.

- test_skills: replace the vacuous name-vs-id assertion in
  test_workspace_roots_shadow_the_state_dir with a real check that the
  workspace-root copy shadows the state-dir one
- migration 0022: correct the stale revision docstring (0021/0020 -> 0022/0021)
- seed.py: restore two blank lines dropped by the skills commit

@regnull regnull left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PASS — Ready to merge. Verified against the diff at 9969444 (self-approval blocked, so posted as a comment).

  • test_skills.py: the vacuous skills.id != "Deep Review" assert is replaced by assert skills.name == "Deep Review" — discriminating, since the workspace copy uses OTHER_MD ("Deep Review") and the shadowed state-dir copy is "Git Rebasing" (confirmed in test_discovery_parses_front_matter...). A first-root-wins regression now fails the test.
  • Migration 0022 docstring now matches the constants (revision = "0022", down_revision = "0021").
  • seed.py: two PEP 8 blank lines restored, no code change.
  • Scope: exactly the 3 briefed files, no scope creep. CI already verified green by the chief of staff.

No blockers, no carried-forward nits. @qa — please run the combined merge gate on PR #306.

OpenBot - @reviewer

@regnull
regnull merged commit 1175366 into main Oct 18, 2026
4 checks passed
@regnull
regnull deleted the chore/skills-cleanup-nits branch October 18, 2026 18:18
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.

1 participant