Skip to content

sync: upstream pstack c742dd6 (0.15.36) - #33

Merged
AlexNegrescu26 merged 3 commits into
mainfrom
sync/upstream-c742dd6
Oct 31, 2026
Merged

AlexNegrescu26 merged 3 commits into
mainfrom
sync/upstream-c742dd6

Conversation

@AlexNegrescu26

@AlexNegrescu26 AlexNegrescu26 commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

Upstream commits since 519d36a

c742dd6	2026-10-27	feat(pstack): make Orchestrate agentic and delete the orch scripts (#1043)
ab1f702	2026-10-27	feat(pstack): port recent skill updates (#986)

Summary

This moves the pin from 519d36a (0.15.34) to c742dd6 (0.15.36). It unblocks the scheduled sync, which failed its pre-flight on 2026-10-28 and 2026-10-29. Upstream deleted skills/poteto-mode/scripts/orch/, so the carried patch zzzz-orch-lock-takeover.patch no longer applied and 29 rules went stale.

  • Orch removal. Deleted the obsolete patch, dropped orch/ from the typecheck patch's include list, and deleted the rules and exemptions that described the orch CLI. PORTING.md no longer describes deleted code.
  • New upstream text ported.
    • Interrogate now delegates to arena.
    • The arena cross-judge is never from the parent's family, and it is skipped and reported when no other-family judge runs.
    • Orchestrate is now agentic. That covers the tracker and store, isolated: true workers, fresh workers in place of forks, and the PSTACK_LANDING_GRANT=1 merge gate.
  • rules.sed defects fixed. Some were introduced by this PR and some were already on main.
    • Rule 34. A greedy (\b.*)?\. deleted the sentences that followed it in five files. One of them was feature.md's mandatory arena delegation.
    • Rule 140. Arena step 3 lost its "Spawn more runners" guidance.
    • Rule 228. It never fired, so orchestrate still said "new cloud VM".
    • Rule 512 (on main). A bare && in its replacement spliced the git fetch sentence into opening-a-pr.md three times.
    • Rule 388 (on main). A generic Spawn one <word> rule split noun phrases ("Spawn one blinded in one task call ... judge").
    • Rules 547, 551, 560 (on main). They produced double parens.
    • poteto-agent pointed at a nonexistent .cursor-plugin/plugin.json.
  • stale-exempt.tsv now has 87 entries for 87 stale rules. Exemptions that named live rules are gone, and the header is re-dated to c742dd6.

Review

  • An independent reviewer (Claude) requested changes at 4275556. All 14 findings are fixed in 73f30d9.
  • The cross-family reviewer (Qwen3.8) returned VERDICT: FAIL at 73f30d9. Its six findings were the splice, the phrase split, the conflicting spawn shapes, the dangling plugin.json, false exemptions, and the double parens. All six are fixed in bb0e701.
  • The cross-family reviewer returned VERDICT: PASS at bb0e701. It also re-ran every rule against raw upstream across the whole tree and found no new splice, split, dropped text, bare &, or leftover Cursor term.

Verification

  • CANON=/tmp/cursor-plugins bash omp-port/check-port.sh printed check-port: PASS at bb0e701. That covers 36 reported checks: 32 PASS, 3 REPORT, and 1 SKIP, since the target is the pin. Counted from the gate output at bb0e701. The build equals the build at c742dd6.
  • bash omp-port/test-gate-mutations.sh and bash omp-port/test-worktree-audit.sh both pass.
  • bun omp-port/smoke-plugin.mjs registers 60/60 skills on omp 18.14.1.
  • A content-loss script checked every upstream line containing "per the Subagents section". Every trailing sentence survives in the generated file.
  • CI at bb0e701 (run 41226354330) passed gate and smoke.

Known gaps, handled in a stacked PR

The gate cannot yet catch a bare & in a replacement, the paren-group fault, greedy mid-line .*, shadowed rules, or exemptions that name live rules. Today's defects shipped while it printed PASS. fix/gate-blind-spots adds those checks, stacked on this branch.

Rule 34 matched to the last period on the line, so it deleted every
sentence after the reasoning-and-speed sentence in automate-me, feature,
hillclimb, multi-phase-plan, and perf-issue. It now stops at the first
period. Arena step 3 keeps "Spawn more runners when ..." and the
reasoning sentence.

The orchestrate isolation rule now runs before the environment token rule,
so the Cursor cloud VM sentence no longer ships. Orchestrate's Project
tracker, Project store, and fork sentences get omp translations. The arena
cross-judge requires a judge from another model family, as upstream does.
Interrogate no longer requests isolation upstream never asked for, and
rule 29 no longer names a per-skill config key.

Dead cross-judge rules, orch runtime rules, and the forward-compat
exemptions that silenced the staleness gate for live rules are gone.
Removed-text exemptions use the eb4db2b form. PORTING.md no longer
describes the deleted orch code.
Rule 512's replacement held a bare `&&`, which sed expands to the whole
match, so opening-a-pr.md shipped the git-fetch clause spliced in three
times. It now appends through a capture group.

The generic `spawn one <word>` rule split noun phrases ("one blinded in
one `task` call ... judge"). Four sentence rules replace it and append the
one-item clause after the whole sentence. autopilot-full starts all
owners in one call, because its step 3 runs owners in parallel and
multi-phase-plan already uses that batch shape. The same line loses
"Cursor isolated subagent".

Rules 547, 551 and 560 wrapped their left side in an ERE group, which
consumed the literal parens their replacement re-added, so why,
session-pickup, show-me-your-work and principle-never-block shipped
`((`. They now match the text inside the parens.

poteto-agent picks among installed copies by the `package.json` version
beside `skills/`, since `.cursor-plugin/plugin.json` is not shipped.

stale-exempt.tsv drops seven entries whose rules are live at c742dd6,
so every remaining entry names a rule the gate reports as stale.
@AlexNegrescu26
AlexNegrescu26 merged commit 04609ab into main Oct 31, 2026
6 checks passed
@AlexNegrescu26
AlexNegrescu26 deleted the sync/upstream-c742dd6 branch October 31, 2026 19:10
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