Skip to content

pstack no-comments: default scope diffs against main instead of the merge-base, and step 2's keep rule contradicts Comment Sicko #1293

Open

Description

@0x8205

Two problems in pstack/skills/no-comments and pstack/agents/comment-sicko.md (seen in 0.15.46). Neither depends on the harness.

1. The default scope sweeps in other people's commits

no-comments (Scope): "Otherwise use the current diff against the base branch, default main, including the working tree."
comment-sicko.md: "If none exists, feed me the current diff against main."

Read literally, that is git diff main. On a branch that is behind main, that diff also contains every commit that landed on main after the branch point, shown reversed. In one run on a real PR (7 files changed), git diff main returned 84 files, 77 of them unrelated to the PR. The agent only found that out after Comment Sicko started flagging comments the PR never touched.

Suggested fix: the scope is the merge-base diff, git diff $(git merge-base HEAD <base>), which includes the working tree. Use the same wording in both files, for example: "Otherwise use the diff from the merge-base with the base branch (default main) to the working tree."

2. Step 2's keep rule contradicts Comment Sicko's exceptions

no-comments step 2: "A keep survives only with proof it is about something we cannot change."
comment-sicko.md exceptions include "Doc comments that define a public API contract" and "Legal or license headers". A public API doc comment describes our own code, which we can change, so step 2 tells the parent to delete what the subagent was told to keep. In practice the parent either overrides correct keeps or has to guess which rule wins.

Suggested fix: state step 2's rule in terms of Comment Sicko's list. For example: "A keep survives only when it matches one of Comment Sicko's exceptions, with proof." That way the list stays the single source.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions