Skip to content

Sync upstream pstack 0.15.34 to 0.15.36 - #53

Merged
pmwoz merged 1 commit into
mainfrom
sync-upstream-pstack-20261028
Oct 28, 2026
Merged

pmwoz merged 1 commit into
mainfrom
sync-upstream-pstack-20261028

Conversation

@pmwoz

@pmwoz pmwoz commented Oct 28, 2026

Copy link
Copy Markdown
Owner

Syncs cursor/plugins from 519d36a to c742dd6. The pstack version moves from 0.15.34 to 0.15.36. The three-way merge had one conflict, in skills/setup-pstack/SKILL.md step 3(c). It keeps the port's wording (descriptor, structured question, provider) and takes upstream's new cross-judge rule: Arena runs one judge, tries only values from a provider other than the parent's in list order, and an inherit-parent or auto value never judges. README.md, skills/poteto-help/SKILL.md, and skills/poteto-mode/SKILL.md merged cleanly with their drift, and every drift reason stays true.

Upstream commits

  • ab1f702 feat(pstack): port recent skill updates (#986). Effect on the port: adapter updated.
    • Interrogate adversaries now run arena Phase A and B and keep repros in their own worktree, so they are writing lanes, not read-only reviewers. The adapter's writing-lane bullet now names them and maps "copy the scope's uncommitted changes into each worktree" to committing the scope first, because isolation: "worktree" copies no uncommitted edits. The read-only bullet now names how explorers and the arena judge as examples.
    • poteto-mode, arena, and interrogate add a fallback chain for a rejected slug that ends in the closest valid slug from the error or the parent model. The adapter's Model per role section now says its "never switch unasked" rule replaces every such fallback, matching T3's injected instructions.
    • The autopilot, ketchup-video, explain-the-number, babysit, opening-a-pr, and multi-phase-plan edits name no Cursor mechanic the adapter lacks.
  • c742dd6 feat(pstack): make Orchestrate agentic and delete the orch scripts (#1043). Effect on the port: adapter updated.
    • The Locations entry drops ORCH_STORE for the deleted scripts/orch, maps "the Project store" to the existing store path, and puts the Project tracker at notes.md in that directory.
    • "PR and CI event subscriptions" map to watch_pull_request in the /loop around a PR bullet. The retro watcher is gone, so the bullet on events a PR watch cannot see drops it.
    • "Fork when new work needs a worker's built state" maps to the existing send-to-child case in the Subagents table.

Version

Port version 0.12.0 to 0.13.0 (minor, because the upstream version changed).

Checks

  • bun run check: pass (637 plugin files, 13 drift entries)
  • bun test tools --timeout 30000: 39 pass. With the default 5 s timeout, two or three watch tests time out on this machine (load average 137). This PR does not touch tools/.
  • bun run typecheck: pass

@pmwoz
pmwoz merged commit 27977f6 into main Oct 28, 2026
1 check 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.

1 participant