Skip to content

chore(upstream): merge cursor/plugins - #28

Merged
mstephenholl merged 18 commits into
mainfrom
upstream-merge-24
Oct 20, 2026
Merged

mstephenholl merged 18 commits into
mainfrom
upstream-merge-24

Conversation

@mstephenholl

Copy link
Copy Markdown
Owner

Upstream: cursor/plugins@a66a8931c2dd

Closes #24. merge-upstream.py stopped on a conflict that needed a person, so this pull request finishes that merge by hand. Upstream has moved past the issue's 88d4751 since then, but the newer commits touch nothing the port keeps.

From upstream

Conflict resolved

  • setup-pstack/SKILL.md: upstream's only change was a new step offering a formal verification skill (pstack: offer formal verification in setup, sync help and guide cursor/plugins#715). The rest of upstream's side of the conflict was its own Cursor version of this skill, which the port replaces. I kept the port's version and added the offer as step 7, worded the port's way: read ~/.agents/pstack/skills/create-formal-verification-skill/SKILL.md and follow it, instead of invoking the skill wherever Cursor installed pstack.

Ported

  • maintain-formal-verification-skill (separate commit): it finds and updates a project-local verify skill, so it gets the pstack-harness pointer, whose rules say where to search for project skills in Claude Code and Codex. It is user-only, so it gets the Codex policy file. It is added to SKILLS in port/install.sh. The README now lists each verification skill next to its maintain skill, so "Keeping that skill accurate" sits under the skill it refers to again.

Proof

  • 252 unit tests and install_test.sh pass, and check.py reports 0 problems across 54 pstack skills.
  • Not run: port/smoke/smoke.py. It tests the installed copy in ~/.agents/pstack and needs Codex, which isn't on this machine. Its scenarios don't cover sharpen, setup-pstack, or either formal verification skill.

poteto and others added 18 commits October 18, 2026 19:45
Removes the sentence "Don't hand back a rewritten prompt." from the sharpen skill and regenerates the Claude Code copy, mirroring everysphere #1147012.
…or#715)

* feat(pstack): offer /create-formal-verification-skill in /setup-pstack

Ask once at the end of setup whether the user wants a formal
verification skill, unless the project already has one. On yes, run
/create-formal-verification-skill. The offer matches the existing
/create-verification-skill offer.

Co-authored-by: lauren <[email protected]>

* Sync poteto-help and the pstack guide with shipped skills

Document /create-formal-verification-skill, the setup-pstack formal
verification offer, /ketchup, /sharpen, /in-your-own-words, the Claude
Code install, the Opening a PR playbook, the verification skill Helpers
section, and Babysit's Origin path.

Co-authored-by: lauren <[email protected]>

* Regenerate the Claude Code pstack harness tree

Co-authored-by: lauren <[email protected]>

---------

Co-authored-by: Cursor Agent <[email protected]>
…cret-copy

zoom: require Client Secret with Client ID (1.0.2)
…al-verification-skill (cursor#721)

The event-order sentence names TLA+ as the default in any language, and
the sentence that recommended TLA+ for concurrent and distributed
designs is gone. When no verifier runs on the language, the agent says
so and tests the real code with generated inputs, not a hand model of
the function.

The new paragraph is the exact text that a preregistered eval tested.

Co-authored-by: Cursor Agent <[email protected]>
* Record covered code and sync commit in formal verify skills

create-formal-verification-skill now writes, into the generated verify skill,
which files and functions each check covers and the commit at which the
verification was last confirmed to describe them, so a later agent can see
when covered code has changed since.

Co-authored-by: lauren <[email protected]>

* Add maintain-formal-verification-skill

Upkeep loop for a formal verify skill: read the commits that touched covered
code since the recorded sync commit, update the model, harness, or properties
from the code, rerun, prove each updated check can still fail, and report each
check as in sync, updated, bug, or blocked. Listed in the README and in the
poteto-help routing table.

Co-authored-by: lauren <[email protected]>

* Find the formal verify skill by what it does, not by name

create-formal-verification-skill gives the generated skill no fixed name, and
setup finds it by its description. The maintain skill now does the same.

Co-authored-by: lauren <[email protected]>

* Name maintain-formal-verification-skill in the formal verification docs

Adds the skill to the spots that already cover formal verification: the
verify-and-ship section, the special-cases sentence on guide page 9, and the
poteto-help state check and recipe.

Co-authored-by: lauren <[email protected]>

* Point the guide page 9 link at the formal verification section

Co-authored-by: lauren <[email protected]>

* Keep the sync commit in place for a blocked check

maintain-formal-verification-skill set the sync commit to the checked commit
for every check, including a blocked one. A blocked check was not confirmed to
describe the code, so moving its sync commit hides the drift from the next
pass. Step 6 now leaves it in place and says so in the report. Step 2 now
points at step 5, where a failure is judged.

Co-authored-by: lauren <[email protected]>

---------

Co-authored-by: Cursor Agent <[email protected]>
…ation-skill (cursor#724)

* docs(pstack): match guide page 6 to create-formal-verification-skill's tool choice

cursor#721 made TLA+ the default for event-order questions in any language, and
added a fallback: when no verifier runs on the language, the agent says so
and tests the real code with generated inputs. The guide's tool-choice
paragraph still described the old wording. Claude Code harness copy
regenerated.

Co-authored-by: lauren <[email protected]>

* chore(pstack): bump to 0.15.28

Co-authored-by: lauren <[email protected]>

---------

Co-authored-by: Cursor Agent <[email protected]>
…tools

X plugin: livestream tools (sources, broadcasts, scheduled broadcasts, chat moderation)
…ite (cursor#729)

* pstack: restore /sharpen to the original prompt, plus one line to leave choices open

Co-authored-by: lauren <[email protected]>

* pstack: say /sharpen returns a rewritten prompt and doesn't do the task

Co-authored-by: lauren <[email protected]>

* chore(pstack): bump to 0.15.29

Co-authored-by: lauren <[email protected]>

* pstack: put /sharpen's four asks in a numbered list

Drops the semicolons and the (1) to (4) markers that broke technical-writing
and unslop rule 13. Adds "do four things" so a complete sentence introduces
the list. Every other word is unchanged.

Co-authored-by: lauren <[email protected]>

---------

Co-authored-by: Cursor Agent <[email protected]>
X plugin: broadcast chat history (get_broadcast_chat) and chat summaries
Resolved pstack/skills/setup-pstack/SKILL.md by keeping the port's version and adding upstream's new formal verification offer as step 7, worded the port's way: read the skill and follow it, instead of invoking it wherever Cursor installed pstack.
It uses no Cursor terms, but it finds and updates a project-local verify
skill, so it gets the pstack-harness pointer that says where to search for
one in both harnesses. It is user-only, so it also gets the Codex policy
file. The README now pairs each verification skill with its maintain skill.
@mstephenholl
mstephenholl merged commit a2bc39e into main Oct 20, 2026
9 checks passed
@mstephenholl
mstephenholl deleted the upstream-merge-24 branch October 20, 2026 18:31
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.

Upstream cursor/plugins needs a manual merge

7 participants