Skip to content

Require explicit approval for upstream agent work - #7322

Open
OldJobobo wants to merge 6 commits into
omacom:quattrofrom
OldJobobo:guard-agent-upstream-development
Open

OldJobobo wants to merge 6 commits into
omacom:quattrofrom
OldJobobo:guard-agent-upstream-development

Conversation

@OldJobobo

@OldJobobo OldJobobo commented Aug 17, 2026 •

Copy link
Copy Markdown
Contributor

Problem

The globally installed Omarchy skill says source development is out of scope, but its contribution workflow can still be read as permission to leave an unrelated project, create an Omarchy checkout, and begin implementing a fix after diagnosing or reporting a bug.

A request to diagnose or report an Omarchy bug should not imply permission to implement it upstream. Likewise, preparing a fix should not imply permission to push it or open a PR.

Change

Preserve the existing reporting and PR guidance while adding explicit scope gates:

  • Route diagnosis, reporting, suggestion, and explicit upstream-fix requests through the contribution guide.
  • State that diagnosis and bug reporting do not authorize implementation.
  • Prevent agents from leaving the current project or creating/modifying an Omarchy checkout without an explicit upstream-fix request.
  • Require the agent to explain the need for a separate checkout and get confirmation before creating one.
  • Preserve the fork, test, capture, and PR workflow.
  • Require explicit approval before pushing or opening a PR.

Validation

  • git diff --check
  • Targeted assertions confirm that diagnosis routes through the guide, the scope and approval guards are present, and the original fork/PR workflow remains documented.
  • ./test/all was started but not completed because the full suite was too resource-intensive for the active system. Before it was stopped, it reached an environment-dependent, unrelated failure requiring a separate omarchy-pkgs checkout. This change only touches Markdown agent guidance.

Copilot AI balanced review requested due to automatic review settings August 17, 2026 22:51

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Clarifies that the end-user Omarchy skill supports reporting and diagnosis, not upstream source development.

Changes:

  • Adds explicit scope boundaries against unsolicited source changes.
  • Removes fork, clone, push, and PR instructions.
  • Reframes contributing guidance around reports and suggestions.

Tip

If you aren't ready for review, convert to a draft PR.
Click "Convert to draft" or run gh pr ready --undo.
Click "Ready for review" or run gh pr ready to reengage.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
default/agents/skills/omarchy/SKILL.md Updates the contributing topic description.
default/agents/skills/omarchy/contributing.md Adds scope guards and removes source-development workflow.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@OldJobobo
OldJobobo force-pushed the guard-agent-upstream-development branch from f12962c to 6c54a8f Compare August 17, 2026 22:57
Copilot AI review requested due to automatic review settings August 17, 2026 22:57
@OldJobobo OldJobobo changed the title Keep the end-user agent skill out of source development Require explicit approval for upstream agent work Aug 17, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Suppressed comments (1)

default/agents/skills/omarchy/SKILL.md:49

  • The new upstream-fix route remains unreachable for a direct implementation request: this same skill still says “Do NOT use this skill for Omarchy development tasks” (line 37), its frontmatter excludes source development (lines 10–11), and line 82 again declares development out of scope. An agent following those higher-level loading rules will not load contributing.md, so it never sees the new checkout and publishing approval gates. Make explicit reporting/suggestion/upstream-fix requests exceptions to the skill exclusion, while continuing to defer actual source-tree conventions to the repository instructions.
- [`contributing.md`](contributing.md) - reporting Omarchy bugs and, when explicitly requested, submitting fixes upstream

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 33a2f53413

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copilot AI review requested due to automatic review settings August 17, 2026 23:02
@OldJobobo
OldJobobo marked this pull request as draft August 17, 2026 23:05

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Suppressed comments (1)

default/agents/skills/omarchy/SKILL.md:49

  • This link does not actually route explicit upstream-fix requests through this guide. The same skill still says it is not for contributing to source code (lines 18–19), instructs agents not to use it for development tasks (line 37), and repeats that such requests are out of scope (line 82); the frontmatter also only describes end-user customization. An agent handling an upstream-fix request will therefore be told not to load the skill before it can discover this link. Please update the skill’s activation/scope guidance to include diagnosis, reporting, suggestions, and explicit upstream-fix requests while retaining the approval gates in contributing.md.
- [`contributing.md`](contributing.md) - diagnosing or reporting Omarchy bugs and, when explicitly requested, submitting fixes upstream

@OldJobobo OldJobobo left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ready for review

@OldJobobo
OldJobobo marked this pull request as ready for review August 17, 2026 23:11

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3ff874856f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@omarchybot omarchybot added the documentation Improvements or additions to documentation label Sep 27, 2026
The gate allowed source changes only for an explicit upstream fix. With the skill now invoked for more than end-user requests, someone already in an Omarchy checkout asking for a feature would be refused or asked again despite having asked for the work. Gate on an explicit request to change Omarchy, and say that diagnosing, reporting, or customizing is not one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Codex Medium <noreply@openai.com>
@omarchybot omarchybot added verified Omarchy Triage has verified that this issue is ready for final review ready Good to merge labels Sep 28, 2026
@omarchybot

Copy link
Copy Markdown
Collaborator

Reviewed as a documentation change by Claude Opus 5.5, with Codex Medium as a second opinion over four rounds. Only Markdown changed, so nothing was run: the review read the text against the repository at the head. The things it names hold up: omarchy debug --no-sudo --print skips the upload menu, the interactive omarchy debug uploads to logs.omarchy.org with a 24-hour expiry, ./test/all and the omarchy dev commands exist, and the links resolve. It merges cleanly into current quattro, which has since changed the repository name in contributing.md to omacom/omarchy.

I pushed one commit, 2322fb9. Codex found that the gate let an agent do source work only for an explicit upstream fix. Because the skill is no longer limited to end-user requests, it would now load for someone already working in an Omarchy checkout, and it would refuse or second-guess a feature they had explicitly asked for. The commit changes the frontmatter exclusion, both gates in SKILL.md and both in contributing.md to "explicitly asks for a change to Omarchy itself", and adds that diagnosing, reporting or customizing is not that request. Your other safeguards stay as they were: no drift from a diagnosis into source work, confirmation before creating a checkout, and explicit approval before uploading diagnostics, filing an issue, pushing or opening a PR. Codex's last round on the updated head was clean.

One thing for the maintainer: #6718 rewrites the same skill much more broadly, including its reporting and upstream handoff, so whichever lands second will need rebasing. This is now waiting on the maintainer's decision.

@omarchybot omarchybot added ready Good to merge and removed ready Good to merge labels Sep 28, 2026
@omarchybot omarchybot added ready Good to merge and removed ready Good to merge labels Sep 28, 2026
@omarchybot omarchybot removed ready Good to merge verified Omarchy Triage has verified that this issue is ready for final review labels Oct 11, 2026
quattro (omacom#5925) removed the body's "When This Skill MUST Be Used" list in favour of the frontmatter, which collided with this branch's additions to that list. The resolution keeps quattro's frontmatter and section removal, adds this branch's diagnosing, reporting and explicit-contribution triggers to the frontmatter, and carries the "diagnosing, reporting, or customizing is not that request" clause into Source Development Scope so the gate it described is not lost with the section.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@omarchybot omarchybot added the verified Omarchy Triage has verified that this issue is ready for final review label Oct 11, 2026
@greptile-apps

greptile-apps Bot commented Oct 11, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge.

Summary

Adds explicit approval steps to the installed Omarchy agent guidance.

  • Omarchy bug reports are prepared for review before they are shared.
  • Upstream fixes need an explicit request and approval to publish.

No actionable issues found.

Reviews (2) · Last reviewed commit: "Merge quattro into guard-agent-upstream-..." · Reviewed by Greptile

@omarchybot omarchybot added the ready Good to merge label Oct 11, 2026
@omarchybot

Copy link
Copy Markdown
Collaborator

This stopped merging cleanly after #5925 landed on quattro, which removed the "When This Skill MUST Be Used" section from SKILL.md and moved its triggers into the frontmatter. This PR had edited that section, so I merged quattro into the branch (7f16cd4, a merge commit, no rebase) and resolved the conflict this way: #5925's frontmatter and its removal of the section stay as they are, the triggers this PR added (diagnosing or reporting Omarchy bugs, suggesting features, explicit requests to contribute fixes upstream) are now in the frontmatter, and the sentence saying diagnosing, reporting or customizing does not count as a request for source work now lives in Source Development Scope, so that rule wasn't lost along with the section. contributing.md merged without conflict.

Only Markdown changed, so nothing was run. I re-read both files against the tree at the new head. The frontmatter still parses as YAML. omarchy debug --no-sudo --print, the 24-hour upload to logs.omarchy.org, ./test/all, the omarchy dev commands, the omacom/omarchy links and capture.md all match what the text says, and the two files agree on when source work, a new checkout or publishing is allowed. Codex Medium reviewed the merged diff and the conflict resolution as a second opinion and found nothing. It had this session's reasoning available to read, so its agreement isn't fully independent.

It now merges cleanly into quattro, CI is green, and it's waiting on the maintainer.

@omarchybot omarchybot removed verified Omarchy Triage has verified that this issue is ready for final review ready Good to merge labels Nov 16, 2026
quattro now documents the diagnostics command as omarchy-debug, because the omarchy router cannot find it on a package install (omacom#13817), and that rewrote the comment this branch had put the upload approval on. Keep the approval gate and name the command the way quattro does.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@omarchybot omarchybot added the verified Omarchy Triage has verified that this issue is ready for final review label Nov 16, 2026
@omarchybot

Copy link
Copy Markdown
Collaborator

This stopped merging cleanly again after #13817 landed on quattro. That change documents the diagnostics command as omarchy-debug rather than omarchy debug, because the omarchy router can't find it on a package install, and it rewrote the comment in contributing.md where this PR requires the user's approval before uploading diagnostics. I merged quattro into the branch (99afece, a merge commit, no rebase) and resolved the one conflict by keeping your approval wording under the new command name. SKILL.md merged without conflict.

Only Markdown changed, so nothing was run. I re-read both files against the tree at the new head: omarchy-debug --no-sudo --print and its interactive upload to logs.omarchy.org with a 24-hour expiry, ./test/all, the omarchy dev commands, capture.md and the omacom/omarchy links all match what the text says, the frontmatter still parses as YAML, and the two files agree on when source work, a new checkout or publishing is allowed. Codex Medium and muse-wonder (via pi, thinking high) reviewed the merged diff and the conflict resolution as second opinions and found no defects. They could read this session's reasoning, so their agreement isn't fully independent.

It merges cleanly into quattro again, and CI was still running on the new head when I wrote this. Nothing is needed from you, @OldJobobo. What's left is the maintainer's decision: this changes the skill's description from excluding Omarchy source development to also loading for bug diagnosis, reporting and explicit upstream-fix requests, which widens a boundary quattro currently draws on purpose, and #6718 is still open rewriting the same skill more broadly, so whichever lands second will need updating.

@omarchybot omarchybot removed the verified Omarchy Triage has verified that this issue is ready for final review label Nov 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants