Skip to content

feat(setup): add .apache-magpie-local/ personal override surface#850

Merged
potiuk merged 1 commit into
apache:mainfrom
justinmclean:magpie-local-convention
Jul 13, 2026
Merged

feat(setup): add .apache-magpie-local/ personal override surface#850
potiuk merged 1 commit into
apache:mainfrom
justinmclean:magpie-local-convention

Conversation

@justinmclean

Copy link
Copy Markdown
Member

Summary

Implement acceptance 5 of the adoption-and-setup spec: a gitignored, per-person override directory read at runtime before the committed .apache-magpie-overrides/ surface. Precedence: personal-local → committed → organization → framework default (first hit wins).

Changes:

  • docs/setup/agentic-overrides.md: document two-directory lookup chain, gitignore requirement, and updated hard rules for both surfaces
  • skills/setup/SKILL.md: update Golden rules 4 and 7 for the new surface
  • skills/setup/adopt.md: add /.apache-magpie-local/ to Step 7 .gitignore entries; surface the personal override dir to the user in Step 9
  • skills/setup/overrides.md: add --local flag, Step 0b surface-choice flow, and updated Step 3 contract reminders for both surfaces
  • skills/setup-status/SKILL.md: update Adopter overrides preamble to enumerate both lookup paths
  • skills/setup-status/collect.md: document local_overrides field and local_overrides_ignored gitignore flag
  • skills/setup-status/scripts/collect_status.py: add override_dir_status() helper; collect local_overrides; update gitignore_coverage to check /.apache-magpie-local/; update Markdown renderer to show both surfaces
  • skills/setup-status/render.md: update layout reference for the new two-surface Drift & integrity line
  • tools/skill-evals/evals/setup-status/step-4-local-overrides/: 4-case suite exercising dashboard reporting of both override surfaces
  • tools/skill-evals/evals/setup/step-overrides-surface/: 4-case suite exercising the new surface-selection step in overrides.md

Generated-by: Claude (claude-sonnet-4-6)

Type of change

  • Skill change (.claude/skills/<name>/) — eval fixtures updated below
  • Tool / bridge contract (tools/<system>/*.md)
  • Python package (tools/*/ with pyproject.toml)
  • Groovy reference impl
  • Cross-cutting (RFC, AGENTS.md, sandbox, privacy-LLM)
  • Documentation (docs/, README.md, CONTRIBUTING.md)
  • Project template (projects/_template/)
  • CI / dev loop (prek, workflows, validators)
  • Other:

Test plan

  • prek run --all-files passes
  • For Python packages touched: uv run pytest / ruff check / mypy passes
  • For Groovy bridges touched: command-line invocation tested end-to-end
  • For skill changes: eval suite passes for the affected skill
    (PYTHONPATH=tools/skill-evals/src python3 -m skill_evals.runner tools/skill-evals/evals/<skill>/)
  • For skill behaviour changes: a new or updated eval fixture is included in this PR
    (a regression test for the bug fixed / the behaviour added — see CONTRIBUTING.md)
  • Other:

Implement acceptance 5 of the adoption-and-setup spec: a gitignored,
per-person override directory read at runtime before the committed
.apache-magpie-overrides/ surface.  Precedence: personal-local →
committed → organization → framework default (first hit wins).

Changes:
- docs/setup/agentic-overrides.md: document two-directory lookup chain,
  gitignore requirement, and updated hard rules for both surfaces
- skills/setup/SKILL.md: update Golden rules 4 and 7 for the new surface
- skills/setup/adopt.md: add /.apache-magpie-local/ to Step 7 .gitignore
  entries; surface the personal override dir to the user in Step 9
- skills/setup/overrides.md: add --local flag, Step 0b surface-choice
  flow, and updated Step 3 contract reminders for both surfaces
- skills/setup-status/SKILL.md: update Adopter overrides preamble to
  enumerate both lookup paths
- skills/setup-status/collect.md: document local_overrides field and
  local_overrides_ignored gitignore flag
- skills/setup-status/scripts/collect_status.py: add override_dir_status()
  helper; collect local_overrides; update gitignore_coverage to check
  /.apache-magpie-local/; update Markdown renderer to show both surfaces
- skills/setup-status/render.md: update layout reference for the new
  two-surface Drift & integrity line
- tools/skill-evals/evals/setup-status/step-4-local-overrides/: 4-case
  suite exercising dashboard reporting of both override surfaces
- tools/skill-evals/evals/setup/step-overrides-surface/: 4-case suite
  exercising the new surface-selection step in overrides.md

Generated-by: Claude (claude-sonnet-4-6)
@justinmclean justinmclean self-assigned this Jul 13, 2026
@potiuk potiuk merged commit 9bd8a80 into apache:main Jul 13, 2026
19 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.

2 participants