Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .qoder-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pstack",
"displayName": "pstack",
"version": "0.15.43",
"version": "0.15.46",
"description": "if you want to go fast, go deep first. pstack helps you write less, but higher quality code. rigorous agent workflows you can parallelize with confidence.",
"author": {
"name": "Lauren Tan"
Expand Down
4 changes: 3 additions & 1 deletion COMPATIBILITY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Qoder compatibility

pstack 0.15.43 runs on Qoder. The core poteto-mode workflow is compatible. This file records what is verified, what needs setup, and what is out of scope.
pstack 0.15.46 runs on Qoder. The core poteto-mode workflow is compatible. This file records what is verified, what needs setup, and what is out of scope.

## Verified compatible

Expand All @@ -21,6 +21,8 @@ Qoder's exact bugbot login and marker are unverified. Detection covers any host

Run `/setup-pstack` to write `~/.qoder/rules/pstack-models.md` and the model-pinning profiles under `~/.qoder/agents/`. The rule carries a `# defaults: 3` line and a `# budget` line. Budgets are `large` (`xhigh`), `medium` (`high`), and `small` (`medium`). No role runs above `xhigh`.

Upstream 0.15.44 and 0.15.45 moved the Cursor Gemini panel seat from `gemini-4-carbon-high` to `gemini-4-neon-high`, then to `gemini-4-neon-xhigh`, and added migration rules for those slugs. This port's second panel seat is `Fast`, already at `high`. That seat does not follow the Gemini effort change. Those slugs and their migration rules are not written into the defaults, the skills, or the setup-pstack rule. Panel defaults stay `Ultimate high` and `Fast high`.

A rule without the `# defaults: 3` line is from an older setup. On the next run, a line whose role is not in the current shape is dropped. That includes the retired roles `hardest tasks`, `architect runners`, `reflect tooling`, `reflect judgment, divergent, synthesizer`, `how explorer`, `why investigators`, and `why synthesizer`. A `# budget: unlimited` line becomes `large`, because no role runs above `xhigh`. An `arena cross-judge pool` that is exactly one `Ultimate` entry and one `Fast` entry takes the current default list. If the rule also has no `# defaults: 2` line, a `Fast` value at any effort in `feature, refactoring`, `bug-fix`, `perf-issue`, `hillclimb`, or `swarm workers` takes that role's default, and a panel list that is exactly one `Ultimate` entry and one `Fast` entry takes that role's default list. In any other list from that older rule, each `Fast` entry becomes `Ultimate high`. Every other value stays as the user's choice. Until you run setup, roles use the documented auto fallback: `Explore` for read-only work and `poteto-agent` for write work. The fallback works. The pinned-model path stays inactive until setup runs.

## Transcript layout
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# pstack

Qoder port of [pstack](https://github.com/cursor/plugins/tree/2f87c854fe3e2fcda44ca86b46ede35aad3c46b7/pstack) (`0.15.43`) by [Lauren Tan (poteto)](https://x.com/poteto).
Qoder port of [pstack](https://github.com/cursor/plugins/tree/0b46ec399d55f2829e88822998f53b84944837d3/pstack) (`0.15.46`) by [Lauren Tan (poteto)](https://x.com/poteto).

See the [upstream pstack README](https://github.com/cursor/plugins/blob/2f87c854fe3e2fcda44ca86b46ede35aad3c46b7/pstack/README.md) and the [guide](./docs/guide/README.md) for usage and documentation.
See the [upstream pstack README](https://github.com/cursor/plugins/blob/0b46ec399d55f2829e88822998f53b84944837d3/pstack/README.md) and the [guide](./docs/guide/README.md) for usage and documentation.

i'm [poteto](https://x.com/poteto). i'm not a president or ceo, but i've worked with millions of lines of code at Meta, Netflix, and Cursor. i'm also on the react core team where i help build and maintain react compiler.

Expand Down
2 changes: 1 addition & 1 deletion skills/statechart/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Work in a scratch folder outside the repo. Write a TLA+ spec and its config. The
<skill dir>/scripts/statechart SPEC.tla [--config FILE] [--view FILE] [--out DIR]
```

`scripts/statechart.ts` is TypeScript, so run it with a runtime that can execute TypeScript.
`scripts/statechart.ts` is TypeScript, so run it with a runtime that can execute TypeScript. `scripts/statechart` is a POSIX shell script that picks one. On native Windows, run `node --disable-warning=ExperimentalWarning <skill dir>/scripts/statechart.ts` with Node 22.18 to 22.x, or Node 23.6 or later.

The first run installs TLC and Java with mise and needs the network.

Expand Down
5 changes: 4 additions & 1 deletion skills/statechart/scripts/frontends/dot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ export const parseState = (label: string, parsed = new Map<string, [string, Valu

export type Lines = string | Iterable<string>;

export const linesOf = (input: Lines) => (typeof input === "string" ? input.split("\n") : input);
export const splitLines = (text: string) =>
(text.endsWith("\r") ? text.slice(0, -1) : text).split(/\r?\n/);

export const linesOf = (input: Lines) => (typeof input === "string" ? splitLines(input) : input);

export function parseDot(input: Lines): Graph {
const states = new Map<string, State>();
Expand Down
13 changes: 13 additions & 0 deletions skills/statechart/scripts/janitor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import fs from "node:fs";
import { finished } from "node:stream/promises";
import { killGroup } from "./kill.ts";

const [pid, ...dirs] = process.argv.slice(2);

let input = "";
process.stdin.setEncoding("utf8").on("data", (chunk: string) => (input += chunk));
await finished(process.stdin).catch(() => {});
const running = !input.includes("exited");
const groupOutlivesWorker = process.platform !== "win32";
if (running || groupOutlivesWorker) await killGroup(Number(pid));
for (const dir of dirs) fs.rmSync(dir, { recursive: true, force: true });
15 changes: 15 additions & 0 deletions skills/statechart/scripts/kill.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { spawn } from "node:child_process";

export const killGroup = (pid: number) =>
new Promise<void>((resolve) => {
if (process.platform === "win32") {
spawn("taskkill", ["/pid", String(pid), "/t", "/f"], { stdio: "ignore" })
.on("error", () => resolve())
.on("exit", () => resolve());
return;
}
try {
process.kill(-pid, "SIGKILL");
} catch {}
resolve();
});
24 changes: 9 additions & 15 deletions skills/statechart/scripts/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { inspect } from "node:util";
import { boundRun, chartRun, configText } from "./backends/cfg.ts";
import { plainText } from "./backends/plain-text.ts";
import { readConfig } from "./frontends/config.ts";
import { parseDot } from "./frontends/dot.ts";
import { parseDot, splitLines } from "./frontends/dot.ts";
import { readCounterexample, readMarks } from "./frontends/marks.ts";
import { readMessages } from "./frontends/messages.ts";
import { initialOnlyProperties, readChecks, readSany, readSpec } from "./frontends/spec.ts";
Expand Down Expand Up @@ -55,10 +55,10 @@ export function* fileLines(file: string) {
kept = end;
continue;
}
yield* buf.toString("utf8", 0, cut).split("\n");
yield* splitLines(buf.toString("utf8", 0, cut));
kept = buf.copy(buf, 0, cut + 1, end);
}
yield buf.toString("utf8", 0, kept);
yield* splitLines(buf.toString("utf8", 0, kept));
} finally {
fs.closeSync(fd);
}
Expand All @@ -82,7 +82,7 @@ const runChild = (file: string, args: string[], options: { cwd: string; env: Nod
execFile(
file,
args,
{ encoding: "utf8", maxBuffer: 1 << 30, ...options },
{ encoding: "utf8", maxBuffer: 1 << 30, windowsHide: true, ...options },
(error, stdout, stderr) =>
resolve({
status: error ? (typeof error.code === "number" ? error.code : null) : 0,
Expand All @@ -93,14 +93,6 @@ const runChild = (file: string, args: string[], options: { cwd: string; env: Nod
);
});

export const killGroup = (pid: number) =>
new Promise((resolve) =>
spawn("/bin/sh", ["-c", 'kill -s KILL -- "-$1"', "sh", String(pid)], { stdio: "ignore" }).on(
"exit",
resolve,
),
);

export const messageOf = (error: unknown) =>
typeof error === "object" &&
error !== null &&
Expand Down Expand Up @@ -142,10 +134,10 @@ function* outputLines(output: Output) {
rest = buf;
continue;
}
yield* utf8.decode(buf.subarray(0, cut)).split("\n");
yield* splitLines(utf8.decode(buf.subarray(0, cut)));
rest = buf.subarray(cut + 1);
}
yield utf8.decode(rest);
yield* splitLines(utf8.decode(rest));
}

const messagesOf = (output: Output): Iterable<Part> => ({
Expand All @@ -170,7 +162,7 @@ const runToFiles = (
for (const f of files) fds.push(fs.openSync(f, "w"));
let child: ChildProcess;
try {
child = spawn(file, args, { ...options, stdio: ["ignore", ...fds] });
child = spawn(file, args, { ...options, stdio: ["ignore", ...fds], windowsHide: true });
} finally {
for (const fd of fds) fs.closeSync(fd);
}
Expand Down Expand Up @@ -298,6 +290,8 @@ export async function check(specFile: string, configFile: string): Promise<Check
[
`-Djava.io.tmpdir=${tmp}`,
`-DTLA-Library=${folder}`,
"-Dstdout.encoding=UTF-8",
"-Dstderr.encoding=UTF-8",
...jvm,
"-cp",
tlc.jar,
Expand Down
27 changes: 14 additions & 13 deletions skills/statechart/scripts/statechart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import { parseArgs } from "node:util";
import { killGroup, messageOf } from "./run.ts";
import { killGroup } from "./kill.ts";
import { messageOf } from "./run.ts";

const USAGE = `Usage: statechart SPEC.tla [--config FILE] [--view FILE] [--out DIR]
Expand Down Expand Up @@ -110,26 +111,26 @@ try {
{
detached: true,
stdio: ["ignore", "inherit", "inherit"],
env: { ...process.env, TMPDIR: tmp },
env: { ...process.env, TMPDIR: tmp, TEMP: tmp, TMP: tmp },
},
);
janitor = spawn(
"/bin/sh",
[
"-c",
'while read -r line; do :; done; kill -s KILL -- "-$1"; rm -rf -- "$2" "$3"',
"sh",
String(worker.pid),
stage,
tmp,
],
process.execPath,
[...runtime, path.join(import.meta.dirname, "janitor.ts"), String(worker.pid), stage, tmp],
{ detached: true, stdio: ["pipe", "ignore", "ignore"] },
);
const toJanitor = janitor.stdin;
toJanitor?.on("error", () => {});
const exited = new Promise<number>((resolve) =>
worker.on("exit", (code) => resolve(code ?? 2)),
worker.on("exit", (code) => {
toJanitor?.write("exited\n");
resolve(code ?? 2);
}),
);
await Promise.race([stopped, exited]);
await killGroup(worker.pid as number);
const running = worker.exitCode === null && worker.signalCode === null;
const groupOutlivesWorker = process.platform !== "win32";
if (worker.pid !== undefined && (running || groupOutlivesWorker)) await killGroup(worker.pid);
const verdict = await exited;
if (stop) {
console.error(`${stop} stopped the check, so the command wrote nothing.`);
Expand Down
29 changes: 29 additions & 0 deletions skills/statechart/scripts/test/cli.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,35 @@ for (const name of fs.readdirSync(corpus)) {
});
}

function asTlcPrintsOnWindows(text: string) {
const lines = text.split("\n");
let depth = 0;
for (let i = 0; i < lines.length - 1; i++) {
if (/@!@!@STARTMSG \d+:\d+ @!@!@$/.test(lines[i])) depth++;
else if (/^@!@!@ENDMSG \d+ @!@!@$/.test(lines[i])) depth--;
if (!depth) lines[i] += "\r";
}
return lines.join("\n");
}

for (const name of fs.readdirSync(corpus)) {
test(`${name} writes the committed chart and report from TLC's output with Windows line ends`, () => {
const dir = copyCase(name, (d) => {
for (const f of fs.readdirSync(d))
if (f.endsWith(".out"))
fs.writeFileSync(path.join(d, f), asTlcPrintsOnWindows(read(path.join(d, f))));
});
const r = run(dir);
assert.equal(r.stderr, "");
const first = path.join(dir, "verdict-1.exit");
const plain = fs.existsSync(first) ? Number(read(first)) : 0;
assert.equal(r.status, plain === 0 ? 0 : [11, 12, 13].includes(plain) ? 1 : 2);
assert.equal(r.report, read(path.join(corpus, name, "report.md")));
assert.equal(read(path.join(r.out, "chart.mmd")), read(path.join(corpus, name, "chart.mmd")));
for (const f of r.files) assert.doesNotMatch(read(path.join(r.out, f)), /\r|@!@!@/, f);
});
}

const launcher = path.join(here, "../statechart");

const launcherTools = () => {
Expand Down
14 changes: 14 additions & 0 deletions skills/statechart/scripts/test/messages.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
import assert from "node:assert/strict";
import fs from "node:fs";
import path from "node:path";
import { test } from "node:test";
import { fileURLToPath } from "node:url";
import { plainText, runtime } from "../backends/plain-text.ts";
import { readMessages } from "../frontends/messages.ts";
import { readVerdict } from "../frontends/verdict.ts";

const here = path.dirname(fileURLToPath(import.meta.url));

const tool = (code: number, level: number, ...lines: string[]) =>
[`@!@!@STARTMSG ${code}:${level} @!@!@`, ...lines, `@!@!@ENDMSG ${code} @!@!@`].join("\n");

const plain = (text: string) => [...plainText(readMessages(text))].join("");

test("TLC output with Windows line ends names the rule that breaks and prints as with Unix ones", () => {
const unix = fs.readFileSync(path.join(here, "corpus", "FirstRule", "verdict-1.out"), "utf8");
const windows = unix.replaceAll("\n", "\r\n");
assert.deepEqual(readVerdict(readMessages(windows)).broke, { kind: "invariant", name: "NotOne" });
assert.deepEqual(readVerdict(readMessages(windows)), readVerdict(readMessages(unix)));
assert.equal(plain(windows), plain(unix));
});

test("TLC's -tool output prints as plain TLC prints it", () => {
const text = [
tool(2262, 0, "TLC2 Version 2.19 of 08 August 2024 (rev: 5a47802)"),
Expand Down
Loading