Skip to content

sync: upstream pstack 0.15.36 (c742dd6) - #26

Merged
caelaxie merged 2 commits into
mainfrom
cursor/sync-pstack-0.15.36-6274
Oct 28, 2026
Merged

caelaxie merged 2 commits into
mainfrom
cursor/sync-pstack-0.15.36-6274

Conversation

@caelaxie

Copy link
Copy Markdown
Contributor

sync pstack from 99b609a (0.15.32) to c742dd61706fbacc1b95f1a20b7b988cf096ce6c (0.15.36).

upstream commits, oldest first:

  • 34b1b7c feat(pstack): port the statechart compiler (#977)
  • 7c7bde7 bump 0.15.33
  • 740d2c0 fix(pstack): keep qualified action names in property traces (#982)
  • 164ced1 bump 0.15.34
  • 519d36a test(pstack): wait for the reap in the statechart SIGKILL view test (#981)
  • ab1f702 feat(pstack): port recent skill updates (#986, poteto-mode, autopilot playbooks, interrogate, arena, ketchup-video, principle-explain-the-number, orchestrate, readme/guide, bump 0.15.35)
  • c742dd6 feat(pstack): make Orchestrate agentic and delete the orch scripts (#1043, bump 0.15.36)

deslop, control-cli, and control-ui did not change between those commits.

codex adaptations reapplied on the new text:

  • skills stay in .agents/skills/. disable-model-invocation stays out of frontmatter. agents/openai.yaml still sets allow_implicit_invocation: false. each skill still starts by reading the codex adapter.
  • ~/.cursor/rules/pstack-models.mdc stays ~/.agents/pstack-models.md. .cursor/skills/ stays .agents/skills/. guide links stay under .agents/skills/.
  • lines that said deslop, control-cli, and control-ui ship in a separate plugin are dropped the same way as before. they are part of this plugin.
  • poteto-help links to the readme and guide gain one ../ because skills live under .agents/. the install paragraph stays the codex one. the built-in loop and create-skill bullet stays the codex host bullet.
  • poteto-mode still names skill-creator when available.
  • multi-phase plan still uses installed skill paths and git worktrees. the git show origin/main:pstack/skills/... lines stay. the adapter already maps them.
  • setup-pstack keeps the codex config file. the arena cross-judge rule now matches upstream. one judge, other family only, list order, and inherit-parent or auto never judges.
  • the adapter drops the orch cli. those scripts are deleted upstream. project store uses the same codex store path as the agent's store.

harness proof is in a comment.

Open in Web Open in Cursor 

Port pstack from cursor/plugins 99b609a (0.15.32) to c742dd61706fbacc1b95f1a20b7b988cf096ce6c.

Co-authored-by: Kaitian Xie <caelaxie@users.noreply.github.com>
@cursor

cursor Bot commented Oct 28, 2026

Copy link
Copy Markdown

harness proof. codex npm 0.165.0, codex --version prints codex-cli 0.165.0. codex login status is Not logged in.

$ npm view @openai/codex version
0.165.0

$ npm_config_prefix=$HOME/.local npm install --global @openai/codex@0.165.0
added 2 packages in 4s

$ codex --version
codex-cli 0.165.0

isolated CODEX_HOME, same steps as .github/workflows/plugin-install.yml:

$ codex plugin marketplace add /workspace --json
{
  "marketplaceName": "codex-pstack",
  "installedRoot": "/workspace",
  "alreadyAdded": false
}

$ codex plugin add pstack@codex-pstack --json
{
  "pluginId": "pstack@codex-pstack",
  "name": "pstack",
  "marketplaceName": "codex-pstack",
  "version": "0.15.36",
  "installedPath": "/tmp/pstack-install-8figosy1/plugins/cache/codex-pstack/pstack/0.15.36"
}

required skills present (poteto-mode, setup-pstack, deslop, control-cli, control-ui). 597 files under .agents/ match the installed copy byte for byte. installed skill count is 61. orch scripts are absent from the installed copy.

resolved from that installed tree:

  • $pstack:poteto-mode → .agents/skills/poteto-mode/SKILL.md
  • $pstack:arena → .agents/skills/arena/SKILL.md
  • $pstack:interrogate → .agents/skills/interrogate/SKILL.md
  • orchestrate → .agents/skills/poteto-mode/playbooks/orchestrate.md (### Orchestrate)

codex exec cannot run a skill turn here. it exits 1 with 401 Unauthorized (Missing bearer or basic authentication in header) against https://api.openai.com/v1/responses.

ci: https://github.com/pstack-ports/codex-pstack/actions/runs/40618783764
conclusion: success (pull_request on 68aea6c). the job logged codex npm version: 0.165.0, codex-cli 0.165.0, and Installed pstack@codex-pstack with 61 skills.

@caelaxie caelaxie left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verdict: changes requested (comment review, same-account limit).

checked against cursor/plugins c742dd6, 465 files:

  • 406 new statechart files byte-identical to upstream. all 33 removals (orch scripts, old statechart scripts, interrogate references) are gone upstream too.
  • every changed line in the 26 modified files matches the upstream 99b609a..c742dd6 change, except the usual codex swaps (~/.agents/pstack-models.md, .agents/skills/ links, installed swarm path, $pstack: names, cursor-team-kit mentions dropped). setup-pstack and arena take the new cross-judge sentences verbatim.
  • plugin.json and UPSTREAM.md at 0.15.36 / c742dd6. no .cursor files, no cursor-team-kit mentions, deslop/control-cli/control-ui untouched.
  • install ci green on this head; that's the codex proof. the body says harness proof is in a comment, but there's no comment on the pr. either post it or drop the line.

one fix, inline: upstream orchestrate.md line 5 now keeps program state in "the Project tracker (notes.md) and the Project store". the adapter maps the Project store but not the Project tracker, so a codex coordinator has no idea where notes.md lives. map it in the same sentence. no issue to link, so no Closes/Refs needed.

## Durable state and recovery

Where upstream says the agent's store, use `${CODEX_HOME:-~/.codex}/pstack/<workspace-key>/`. Derive a stable workspace key from the primary Git worktree's directory name plus the first 12 hex characters of the SHA-256 of its canonical absolute path encoded as UTF-8, so linked worktrees share state and unrelated repositories do not collide. Outside Git, use the canonical workspace path. Record the resolved absolute directory in the plan and every delegate brief. Plans go under its `docs/`; orchestration uses `orchestrate/<project-slug>/`. Pass that orchestration directory as `--store <absolute-path>` or `ORCH_STORE` on every `orch` call. Keep this state outside the plugin cache and the target repository.
Where upstream says the agent's store or the Project store, use `${CODEX_HOME:-~/.codex}/pstack/<workspace-key>/`. Derive a stable workspace key from the primary Git worktree's directory name plus the first 12 hex characters of the SHA-256 of its canonical absolute path encoded as UTF-8, so linked worktrees share state and unrelated repositories do not collide. Outside Git, use the canonical workspace path. Record the resolved absolute directory in the plan and every delegate brief. Plans go under its `docs/`. Keep this state outside the plugin cache and the target repository.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upstream orchestrate.md line 5 says "Keep the program's state in the Project tracker (notes.md) and the Project store." this maps the store but not the tracker. smallest fix: name the tracker here too, e.g. "Where upstream says the agent's store or the Project store, use .... The Project tracker is notes.md in that directory." nothing else in the adapter needs to change.

Co-authored-by: Kaitian Xie <caelaxie@users.noreply.github.com>
@cursor

cursor Bot commented Oct 28, 2026

Copy link
Copy Markdown

harness proof for 8dcf6d2. codex npm 0.165.0 (npm view @openai/codex version). npm i -g @openai/codex@latest to the default prefix failed with EACCES on /usr/lib/node_modules, so the install used npm_config_prefix=$HOME/.local npm i -g @openai/codex@latest. codex --version prints codex-cli 0.165.0. codex login status is Not logged in.

$ npm view @openai/codex version
0.165.0

$ npm_config_prefix=$HOME/.local npm i -g @openai/codex@latest
added 2 packages in 3s

$ codex --version
codex-cli 0.165.0

isolated CODEX_HOME=/tmp/pstack-install-0q9hbf1t, same steps as .github/workflows/plugin-install.yml. Codex warned it would not create PATH aliases because that home is under /tmp. Both commands exited 0.

$ codex plugin marketplace add /workspace --json
{
  "marketplaceName": "codex-pstack",
  "installedRoot": "/workspace",
  "alreadyAdded": false
}

$ codex plugin add pstack@codex-pstack --json
{
  "pluginId": "pstack@codex-pstack",
  "name": "pstack",
  "marketplaceName": "codex-pstack",
  "version": "0.15.36",
  "installedPath": "/tmp/pstack-install-0q9hbf1t/plugins/cache/codex-pstack/pstack/0.15.36",
  "authPolicy": "ON_INSTALL"
}

required skills present (poteto-mode, setup-pstack, deslop, control-cli, control-ui). 597 files under .agents/ match the installed copy byte for byte, including the new tracker sentence in .agents/skills/poteto-mode/references/codex.md. installed skill count is 61.

codex app-server skills/list resolves these from that installed tree (pluginId pstack@codex-pstack):

  • $pstack:poteto-mode → /tmp/pstack-install-0q9hbf1t/plugins/cache/codex-pstack/pstack/0.15.36/.agents/skills/poteto-mode/SKILL.md
  • orchestrate → /tmp/pstack-install-0q9hbf1t/plugins/cache/codex-pstack/pstack/0.15.36/.agents/skills/poteto-mode/playbooks/orchestrate.md (### Orchestrate)

codex exec cannot run a skill turn here. it exits 1 with 401 Unauthorized (Missing bearer or basic authentication in header) against https://api.openai.com/v1/responses.

ci: https://github.com/pstack-ports/codex-pstack/actions/runs/40619257318
conclusion: success (pull_request on 8dcf6d2). the job logged codex npm version: 0.165.0, codex-cli 0.165.0, and Installed pstack@codex-pstack with 61 skills.

@caelaxie caelaxie left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verdict: pass, merging (comment review, same account as author).

re-review of 8dcf6d2 against my review on 68aea6c:

  • the only commit since 68aea6c is 8dcf6d2. it changes one line in .agents/skills/poteto-mode/references/codex.md, adding "The Project tracker is notes.md in that same directory." after the store mapping. that's the fix i asked for. orchestrate.md keeps upstream's line 5 verbatim, and the adapter now maps both the tracker and the store.
  • the proof comment exists now (#26 (comment)), so the body's pointer resolves.
  • proof on this sha: Plugin installation run 40619257318 (pull_request, head 8dcf6d2) is green. it runs codex plugin marketplace add on the checkout, then codex plugin add pstack@codex-pstack. it asserts poteto-mode, setup-pstack, deslop, control-cli, and control-ui are installed, and that every .agents/ file is byte-identical in the installed copy. the comment shows the same steps locally on codex-cli 0.165.0, plus skills/list resolving $pstack:poteto-mode and orchestrate from the installed tree. codex exec stops at a 401 with no login. that's the accepted install + list + installed-copy precedent.
  • not a draft, mergeable (clean). the content findings from my last review still hold: upstream verbatim apart from codex swaps, 0.15.36, no .cursor paths, no cursor-team-kit mentions, and deslop/control-cli/control-ui embedded.

@caelaxie
caelaxie merged commit 76cfbab 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.

2 participants