diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 7083f80..9e07b44 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -10,7 +10,7 @@ "name": "t3-pstack", "source": "./plugins/pstack", "description": "pstack for T3 Code: rigorous agent workflows whose panels and fan-outs run across model families through T3. Original pstack by Lauren Tan (poteto).", - "version": "2.2.3" + "version": "2.2.4" } ] } diff --git a/CHANGES.md b/CHANGES.md index c32e861..c9f0518 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,16 @@ This file is the release changelog, with one `## - ` entry per release, newest first. The Cursor-to-T3 rewrite rules live in [`tools/substitutions.json`](tools/substitutions.json), and the [sync boundary](CONTRIBUTING.md#the-sync-boundary) in `CONTRIBUTING.md` defines how a change to upstream's skill content is declared. +## 2.2.4 - poteto-mode runs interrogate only for a contested design, as Lauren's pstack does + +poteto-mode no longer runs `interrogate` before every pull request. Since 1.0.1 it sent each bug fix, feature, or refactoring diff to the `interrogate reviewers` panel before Opening a PR, and 1.0.6 added a review loop to that gate: later rounds reviewed only the fix diff, a `feature, refactoring` delegate ran the real artifact after each fix round, and the loop stopped after three rounds. The gate was always the port's own addition and never Lauren's text. Through 1.0.14 it lived in the port's `t3-tools.md`, and from 2.0.0-rc.1 it was an anchored insert in `tools/substitutions.json` after Lauren's contested-design trigger. At `c742dd6` Lauren's poteto-mode runs `interrogate` only for a contested design, and the Feature playbook's step 7 says "If the design is contested, `interrogate` before shipping." So in a T3 session every bug fix, feature, and refactoring ran a multi-model adversarial panel that Lauren's pstack saves for a contested design ([#65](https://github.com/chhoumann/t3-pstack/issues/65)). + +This release deletes the insert, so the trigger reads as Lauren's line and no rule requires an `interrogate` panel before a pull request. `interrogate` itself, its `interrogate reviewers` line in the model sheet, and the contested-design trigger do not change. The rules that are not part of the gate stay: a required review with no reviewer from another family stays `BLOCKED: independent review`, a review gate stays closed while no independent reviewer can run, and Autopilot's verifier lanes span model families. The poteto-mode fork took the rule change through a three-way merge of its derived text before and after the change, which removed only the gate line, and its four rules from Michael Denyer's pstack-claude are unchanged. CONTRIBUTING no longer names the review loop as an example of an anchored insert. + +This release syncs nothing from Lauren's pstack, so all three components stay pinned at cursor/plugins `c742dd6`. At that pin each component's dry run reports no undeclared fork, no denylist hit, and no substitution that matches nothing. Neither hooks file changes. This is a patch release: it rewords skill text, and no setting or workflow has to change. On Codex, run `npx -y github:chhoumann/t3-pstack update` after it, as after every release, since each release turns the Codex hook off until `update` runs again. + +Thanks to @PrinceD96 for the report ([#65](https://github.com/chhoumann/t3-pstack/issues/65)). + ## 2.2.3 - Codex keeps running the session-start hook after a poteto-mode script runs On Codex 0.164 and later, a plugin hook's trust covers every file in the installed plugin. At each hook run Codex hashes the plugin folder, skipping only Python bytecode, virtual environments, and package metadata, and compares the hash with the `trusted_content_hash` it stores beside the entry's `trusted_hash` in `config.toml`. watch-pr's `bootstrap.ts` ran `bun install --frozen-lockfile` inside the installed plugin, and from then on Codex failed the session-start hook with `unsupported plugin entry type: .../skills/poteto-mode/scripts/node_modules/.bin/tsc`. After one watch-pr run, every later session in that Codex home started without the routing text, and rerunning the installer did not bring it back. `bootstrap.ts` now installs the scripts' runtime dependency, commander, in `${XDG_CACHE_HOME:-~/.cache}/t3-pstack/poteto-mode-tools/<install key>/`, and runs the script again with that `node_modules` on `NODE_PATH`, through `execve` where Bun has it. The installed plugin stays byte for byte as released. The file is now a declared fork, because upstream installs beside the scripts and has no Codex content hash to keep. @@ -370,11 +380,11 @@ The 40 files Michael Denyer kept in his own form as policy forks go back to Laur | Effort agents | Ten `effort-<level>` and `poteto-agent-<level>` agents, for `@<level>` in a sheet. | Removed. On T3 the effort is an option in each sheet entry. The plugin ships four agents. | T3 adaptation | | `babysit` skill | Michael's Claude Code version of Cursor's `/babysit`. | Removed. The Babysit playbook covers it. | T3 adaptation | | Pi, GitHub Copilot, and skills-only installs | Packaged and tested. | Removed. t3-pstack ships for Claude Code and Codex inside T3. | T3 adaptation | -| Kept from 1.0.14 | | The interrogate gate before Opening a PR and its review loop (severity gate, fix-diff rounds, verify after each fix, three-round cap), arena's no-self-scoring cross-judge, thermos on two families, the dispatch ledger, a worktree per writing child, the family rule and `BLOCKED: independent review`, reflect's 1.0.13 transcript lookup, the 1.0.14 sheet grammar, and the watch-pr settle window. | T3 adaptation | +| Kept from 1.0.14 | | The interrogate gate before Opening a PR and its review loop (severity gate, fix-diff rounds, verify after each fix, three-round cap), until 2.2.4 dropped both, arena's no-self-scoring cross-judge, thermos on two families, the dispatch ledger, a worktree per writing child, the family rule and `BLOCKED: independent review`, reflect's 1.0.13 transcript lookup, the 1.0.14 sheet grammar, and the watch-pr settle window. | T3 adaptation | | architect reconciliation | Accepted deviations were compared with the saved sketch and rationale before each unit closed, with an Implementation reconciliation section in the template. | Lauren's architect, without it. | Michael fork dropped, pending audit | | blast-radius trigger | Also ran before design when a brief asserted something about existing code. | Lauren's trigger. | Michael fork dropped, pending audit | | bro trigger | The description named `/bro` and "say it plainly". | Lauren's description. | Michael fork dropped, pending audit | -| poteto-mode extras | A Platform Adaptation section with a `todo.md` fallback, a run-or-verify driver line, deploy-platform and defect-severity triggers, a project-playbooks paragraph, a closed-review-gate rule, stopping an abandoned agent before replacing it, and every reply item as prose. | Lauren's poteto-mode with the T3 rewrite. The T3 review gate and `BLOCKED: independent review` stay. | Michael fork dropped, pending audit | +| poteto-mode extras | A Platform Adaptation section with a `todo.md` fallback, a run-or-verify driver line, deploy-platform and defect-severity triggers, a project-playbooks paragraph, a closed-review-gate rule, stopping an abandoned agent before replacing it, and every reply item as prose. | Lauren's poteto-mode with the T3 rewrite. The T3 review gate, until 2.2.4 dropped it, and `BLOCKED: independent review` stay. | Michael fork dropped, pending audit | | Autopilot-full merges | Owners stopped at merge-ready and the operator clicked every merge. The root wrote the objective into standing orders, waited for a go above three owners, and stopped a PR at two fix-forwards. | Lauren's rules: an owner merges after a clean verdict. | Michael fork dropped, pending audit | | Autopilot-stack safety | Each verdict recorded head, base, and patch-id. The root cancelled pending merges and leased each push against the captured remote head before changing the chain. | Lauren's rules, including the new lease and merge-result rules above. | Michael fork dropped, pending audit | | Babysit first read | The first status read had to name the requested PR and the merge frontier, and a behind-base gate went to the branch owner. | Lauren's playbook. | Michael fork dropped, pending audit | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dde16ed..c564b9c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ Thanks for helping out. This repo is a **port**, not an original work: the skill Upstream owns the skill text. This port owns the rewrite of upstream's Cursor mechanics into their T3 form, and nothing else. The rewrite has two parts: -- **Substitutions.** [`tools/substitutions.json`](tools/substitutions.json) rewrites each upstream sentence that names a Cursor mechanism: the `Task` tool, `subagent_type`, model slugs, the `pstack-models.mdc` rule, cloud agents, `/loop`, Cursor paths. Most T3 behavior the port adds, such as the dispatch ledger or the review loop, is an anchored insert: a rule whose pattern is an upstream sentence and whose replacement keeps that sentence and appends the T3 text. A substitution leaves upstream's later edits elsewhere in the file mechanical, so the port prefers it to a fork. Each rule's `rationale` names why it exists, and most cite the section of t3-pstack 1.0.14's `t3-tools.md` it replaces. +- **Substitutions.** [`tools/substitutions.json`](tools/substitutions.json) rewrites each upstream sentence that names a Cursor mechanism: the `Task` tool, `subagent_type`, model slugs, the `pstack-models.mdc` rule, cloud agents, `/loop`, Cursor paths. Most T3 behavior the port adds, such as the dispatch ledger, is an anchored insert: a rule whose pattern is an upstream sentence and whose replacement keeps that sentence and appends the T3 text. A substitution leaves upstream's later edits elsewhere in the file mechanical, so the port prefers it to a fork. Each rule's `rationale` names why it exists, and most cite the section of t3-pstack 1.0.14's `t3-tools.md` it replaces. - **Forks.** [`tools/forks.json`](tools/forks.json) declares each file the port keeps in its own form, with a `kind`, a one-sentence `why`, the `since` release, and an `upstream` status. Today that is setup-pstack, which writes the T3 model sheet, the hook points of the watch-pr settle overlay, the poteto-mode scripts' bootstrap, which installs their dependencies outside the installed plugin, the files that carry the rules and watch-pr fixes restored from Michael Denyer's pstack-claude, and the worktree audit and cleanup playbook, which fix [cursor/plugins#449](https://github.com/cursor/plugins/issues/449). Every upstream change to a forked file needs a person to merge it, so a fork is the last resort. The port also owns files upstream does not have: the plugin manifests, the session-start hooks and their routing text, `models.json`, the sheet checker `t3-sheet.mjs`, the watch-pr settle overlay (`settle.ts`), and the transcript lookups reflect uses. The sync lists them as port-only. diff --git a/README.md b/README.md index 2243848..0e390eb 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ npx -y github:chhoumann/t3-pstack update npx -y github:chhoumann/t3-pstack doctor ``` -`npx -y github:chhoumann/t3-pstack` runs the installer from the latest commit on `main`. That is the rolling channel, the same one each home's marketplace auto-updates from. To run one release's installer, name its tag, as in `npx -y github:chhoumann/t3-pstack#v2.2.3 doctor`. +`npx -y github:chhoumann/t3-pstack` runs the installer from the latest commit on `main`. That is the rolling channel, the same one each home's marketplace auto-updates from. To run one release's installer, name its tag, as in `npx -y github:chhoumann/t3-pstack#v2.2.4 doctor`. `install` and `update` are the same command, and a second run changes nothing. With Node 20 or later, it installs or updates the `t3-pstack@t3-pstack` plugin in every Claude Code and Codex config home T3 can run: `~/.claude` and `~/.codex`, `$CLAUDE_CONFIG_DIR` and `$CODEX_HOME`, and the home of each `claudeAgent` and `codex` instance in T3's settings, disabled ones included. Name any other home with `--claude-home <dir>` or `--codex-home <dir>`. Each home's `t3-pstack` marketplace must come from `chhoumann/t3-pstack`, or from `--source <owner/repo|git URL|dir>` on the same run, and a home whose marketplace has another source is left as it is. A run never switches a home's source, so a home already on `chhoumann/t3-pstack` stays on it under another `--source`, and `doctor` warns and prints the commands that move it. A local directory needs a path such as `./t3-pstack`, since `owner/repo` always means GitHub. On Codex it also trusts t3-pstack's session-start hook, once its hooks file is the one this release pins. Codex runs a plugin's hook only once it is trusted, and T3's Codex sessions never ask, so without this step the hook never runs. Codex 0.164 and later tie that trust to every file in the installed plugin, so each release turns the hook off, even one Codex's own auto-update installs, until `update` runs again. Run `update` after each release. diff --git a/VERSION b/VERSION index 5859406..530cdd9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.3 +2.2.4 diff --git a/package.json b/package.json index 3bdceca..f78a134 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "t3-pstack", "private": true, - "version": "2.2.3", + "version": "2.2.4", "description": "The installer and development tooling for t3-pstack, Lauren Tan's pstack rewritten in place for T3 Code. The plugin itself lives in plugins/pstack.", "author": { "name": "Christian Bager Bach Houmann", diff --git a/plugins/pstack/.claude-plugin/plugin.json b/plugins/pstack/.claude-plugin/plugin.json index 055397c..9f2643f 100644 --- a/plugins/pstack/.claude-plugin/plugin.json +++ b/plugins/pstack/.claude-plugin/plugin.json @@ -1,7 +1,7 @@ { "name": "t3-pstack", "displayName": "t3-pstack (pstack for T3 Code)", - "version": "2.2.3", + "version": "2.2.4", "description": "pstack for T3 Code: Lauren Tan's pstack with its Cursor mechanics rewritten in place for T3, so subagents, panels, schedules, and PR watches dispatch through T3's orchestration and panels mix Claude, GPT, and Grok.", "author": { "name": "Christian Bager Bach Houmann", diff --git a/plugins/pstack/.codex-plugin/plugin.json b/plugins/pstack/.codex-plugin/plugin.json index 7395694..ee5f9a5 100644 --- a/plugins/pstack/.codex-plugin/plugin.json +++ b/plugins/pstack/.codex-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "t3-pstack", - "version": "2.2.3", + "version": "2.2.4", "description": "pstack for T3 Code on a Codex host: Lauren Tan's pstack with its Cursor mechanics rewritten in place for T3, so subagents, panels, schedules, and PR watches dispatch through T3's orchestration.", "author": { "name": "Christian Bager Bach Houmann", diff --git a/plugins/pstack/skills/poteto-mode/SKILL.md b/plugins/pstack/skills/poteto-mode/SKILL.md index 08ee78f..1867468 100644 --- a/plugins/pstack/skills/poteto-mode/SKILL.md +++ b/plugins/pstack/skills/poteto-mode/SKILL.md @@ -22,7 +22,6 @@ Remaining triggers: - Code crossing a function boundary → the **architect** skill, parallel design exploration before implementing. - Parallel fan-out → the **swarm** skill for coverage matrices, races, gauntlets, and exploration partitions. Use **arena** for design or code bakeoffs with base selection and grafting. - Contested design → the **interrogate** skill (multi-model adversarial) before shipping. -- A Bug fix, Feature, or Refactoring diff → the **interrogate** skill with the `interrogate reviewers` panel before Opening a PR. Skip it only for a mechanical change, such as a rename or a dependency bump, and say so in the reply. Only interrogate's verified findings block the PR. A nit, or an edge case that cannot occur in practice, never blocks: batch accepted nits into one final fix run or drop them, and give each dismissal its reason. Round 1 reviews the whole change, and each later round reviews only the fix diff. After every fix round, a `feature, refactoring` delegate runs the real artifact and reports `pass`, `fail`, or `could not run` with its evidence. `fail` blocks like a verified finding. `could not run` is not a pass and starts no fix, so report it. After three fix rounds, stop and report the open findings, what kind of failure they suggest, and a recommendation. - Nontrivial multi-step → write the throughput checkpoint (Feature step 3). - Any prose surface, your reply to the user included → the **unslop** skill. Write the reply per **Writing the reply**. Agent-facing prose also follows the harness's skill-authoring skill (`skill-creator` where installed, else the Agent Skills format). - Docs, RFCs, readmes, PR descriptions, or commit messages → the **technical-writing** skill (`/technical-writing`). diff --git a/tests/sync.test.mjs b/tests/sync.test.mjs index 15c2d0f..81641ff 100644 --- a/tests/sync.test.mjs +++ b/tests/sync.test.mjs @@ -171,7 +171,6 @@ describe("applySubstitutions", () => { // The T3 behavior the port adds on an upstream anchor: each must survive. test.each([ ["skills/poteto-mode/SKILL.md", "Interrupt-chained resumes silently drop directives, so fire a fresh subagent with consolidated scope rather than trusting a \"done\" summary.", ["**Dispatch on T3.**", "dispatch ledger", "`BLOCKED: independent review`", "`clientRequestId`"]], - ["skills/poteto-mode/SKILL.md", "- Contested design → the **interrogate** skill (multi-model adversarial) before shipping.", ["before Opening a PR", "verified findings block the PR", "After three fix rounds, stop"]], ["skills/arena/SKILL.md", "With the default pool, a Claude parent gets `grok-4.7-xhigh-fast`. A parent from any other family gets `claude-opus-5-5-xhigh` first.", ["no model scores its own work"]], ["skills/poteto-mode/playbooks/babysit.md", "Run `drive` and `background` under `/loop` in dynamic mode.", ["--timeout 540", "watch_pull_request", "--settle"]], ["skills/poteto-mode/playbooks/autopilot-full.md", "Each owner is a Cursor cloud agent that builds, opens its PR", ["t3_thread_launch", "t3_thread_send"]], diff --git a/tools/substitutions.json b/tools/substitutions.json index caff8a0..f94485b 100644 --- a/tools/substitutions.json +++ b/tools/substitutions.json @@ -168,12 +168,6 @@ "rationale": "the rule is about asking, not the tool", "files": "^skills/poteto-mode/SKILL\\.md$" }, - { - "files": "^skills/poteto-mode/SKILL\\.md$", - "pattern": "- Contested design → the **interrogate** skill (multi-model adversarial) before shipping.", - "replacement": "- Contested design → the **interrogate** skill (multi-model adversarial) before shipping.\n- A Bug fix, Feature, or Refactoring diff → the **interrogate** skill with the `interrogate reviewers` panel before Opening a PR. Skip it only for a mechanical change, such as a rename or a dependency bump, and say so in the reply. Only interrogate's verified findings block the PR. A nit, or an edge case that cannot occur in practice, never blocks: batch accepted nits into one final fix run or drop them, and give each dismissal its reason. Round 1 reviews the whole change, and each later round reviews only the fix diff. After every fix round, a `feature, refactoring` delegate runs the real artifact and reports `pass`, `fail`, or `could not run` with its evidence. `fail` blocks like a verified finding. `could not run` is not a pass and starts no fix, so report it. After three fix rounds, stop and report the open findings, what kind of failure they suggest, and a recommendation.", - "rationale": "Playbooks: Bug fix, Feature, Refactoring and Review loop (t3-pstack 1.0.1 and 1.0.6: a cross-family review gate with a three-round cap). Since pstack 0.15.35 interrogate keeps only findings a rerun confirms, so those verified findings are the gate, in place of its retired Act on bucket and warning severity" - }, { "pattern": "Agent-facing prose also follows the **create-skill** skill (Cursor's built-in for authoring SKILL.md files).", "replacement": "Agent-facing prose also follows the harness's skill-authoring skill (`skill-creator` where installed, else the Agent Skills format).",