Skip to content

chore: sync pstack upstream to 88d4751 (0.15.29) - #3

Draft
foxytanuki wants to merge 4 commits into
mainfrom
codex/pipeline-pstack-sync-0-15-29
Draft

foxytanuki wants to merge 4 commits into
mainfrom
codex/pipeline-pstack-sync-0-15-29

Conversation

@foxytanuki

Copy link
Copy Markdown
Owner

Sync upstream/ to cursor/plugins pstack 88d4751 (0.15.29), up from 12d587d (0.15.5): 56 upstream commits.

Stacked on #1. This branch contains #1's commit (1ee7f61, UPSTREAM → UPSTREAM.lock). Review the last three commits; the diff shrinks to them once #1 merges.

Changes

  • chore(upstream): sync --ref 88d4751. upstream/ is byte-identical to cursor/plugins@88d4751 pstack/ (checked with diff -r against a fresh sparse clone).
  • feat(poteto-help): new overlay/patches/0002-poteto-help-codex.patch, ported from the unpushed local fix/poteto-help-codex-guidance work. It gives Codex install steps that keep an existing skills folder, $skill invocation, no Custom Modes, ~/.codex/pstack-models.md, and no make-bot-ui.
  • docs(harness):
    • Regenerates 0001-worktree-audit-linux-and-codex.patch around upstream's new -b/--base handling; the added lines are unchanged.
    • Maps the 9 new skills in HARNESS.md: ketchup, poteto-help, correct, create- and maintain-formal-verification-skill, benchmark-checklist, principle-explain-the-number, in-your-own-words and sharpen.
    • Adds /visualize → mermaid and per-spawn effort without -fast, renames comment-sicko (upstream #486), and removes the Graphite section (upstream #613 dropped Graphite from orchestrate).
  • Build copies upstream README.md and docs/ into dist/ so the poteto-help and guide links resolve. docs/harness/claude-code.md is documented as not applying to Codex. plugin.json and .cursor-plugin/ are not shipped.
  • #702: all 56 upstream skill names now match their folders, so name normalisation is a no-op. It is kept because it is harmless.
  • README: the requirements no longer mention Graphite/gt auth, and the build and test descriptions are updated.

Verification (Linux, ws01)

  • python3 tools/pstack_opencodex.py build: both patches apply, 55 skills built (54 explicit-only). That is 46 + 9 new, with make-bot-ui still excluded.
  • python3 -m unittest discover -s tests: 67 tests OK. New: test_build, test_harness, test_models, test_poteto_help_build and test_worktree_audit.
  • check-models:
    • Against the local ~/.codex/pstack-models.md and catalog: exit 0, no problems.
    • --defaults against a synthetic catalog: 21 values OK.
    • Upstream defaults now name grok-4.7 and claude-opus-5-5; catalogs without Grok will report those roles as expected.
  • cmp LICENSE dist/LICENSE, cmp upstream/LICENSE dist/LICENSE.pstack, git diff --check, bash -n on the built worktree-audit.sh, and its --help on Linux all pass.
  • Not verified: macOS (the case-collision fix is fix: rename the upstream lock so it does not collide with upstream/ #1's) and live delegation.

lidge-jun and others added 4 commits October 9, 2026 15:12
UPSTREAM and the upstream/ directory differ only by case, so a fresh clone on
a case-insensitive filesystem (default macOS and Windows) cannot hold both:
git reports UPSTREAM as deleted and build fails with IsADirectoryError.

Rename the lock to UPSTREAM.lock (content unchanged) and update its readers.
Add a test that fails when two tracked paths, including directory prefixes,
differ only by case, and a macOS CI job that checks the checkout is complete.
The macOS job also surfaced a temp-path comparison in test_runtime.py that
failed on macOS before this change (/var is a symlink to /private/var); the
test now resolves its temp root.
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.

2 participants