prose-qa 0.2.2 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -28
- package/dist/agent/provider-options.d.ts.map +1 -1
- package/dist/agent/provider-options.js +13 -19
- package/dist/agent/provider-options.js.map +1 -1
- package/dist/agent/provider-options.test.js +12 -2
- package/dist/agent/provider-options.test.js.map +1 -1
- package/dist/agent/runner.d.ts.map +1 -1
- package/dist/agent/runner.js +14 -5
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/verdict.d.ts +5 -2
- package/dist/agent/verdict.d.ts.map +1 -1
- package/dist/agent/verdict.js +33 -1
- package/dist/agent/verdict.js.map +1 -1
- package/dist/agent/verdict.test.js +73 -1
- package/dist/agent/verdict.test.js.map +1 -1
- package/dist/reporter/index.d.ts.map +1 -1
- package/dist/reporter/index.js +4 -2
- package/dist/reporter/index.js.map +1 -1
- package/dist/reporter/index.test.js +32 -1
- package/dist/reporter/index.test.js.map +1 -1
- package/dist/reporter/stats.d.ts +10 -0
- package/dist/reporter/stats.d.ts.map +1 -0
- package/dist/reporter/stats.js +85 -0
- package/dist/reporter/stats.js.map +1 -0
- package/dist/reporter/stats.test.d.ts +2 -0
- package/dist/reporter/stats.test.d.ts.map +1 -0
- package/dist/reporter/stats.test.js +157 -0
- package/dist/reporter/stats.test.js.map +1 -0
- package/dist/types/config.d.ts +1 -1
- package/dist/types/verdict.d.ts +11 -0
- package/dist/types/verdict.d.ts.map +1 -1
- package/dist/types/verdict.js +6 -0
- package/dist/types/verdict.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# Prose-QA
|
|
2
2
|
|
|
3
|
+
> **Beta** — Prose-QA is under active development. Expect rough edges and breaking changes between releases.
|
|
4
|
+
|
|
3
5
|
Write what you want to test in plain text, and let Prose-QA do the rest. This autonomous, LLM-driven testing engine executes complex web workflows and validation checkpoints without the overhead of heavy browser wrappers, bringing frictionless QA to modern development.
|
|
4
6
|
|
|
5
7
|
Requires **Node.js 24+**, `PQA_LLM_API_KEY`, and `llm.provider` / `llm.model` in config.
|
|
@@ -9,40 +11,30 @@ Requires **Node.js 24+**, `PQA_LLM_API_KEY`, and `llm.provider` / `llm.model` in
|
|
|
9
11
|
```bash
|
|
10
12
|
npm install prose-qa
|
|
11
13
|
|
|
12
|
-
pqa config llm.provider anthropic
|
|
13
|
-
pqa config llm.model
|
|
14
|
+
pqa config llm.provider [ollama|fireworks|openai|anthropic|google]
|
|
15
|
+
pqa config llm.model [model-string]
|
|
14
16
|
|
|
15
17
|
export PQA_LLM_API_KEY=...
|
|
16
|
-
pqa run scenarios/**/*.md
|
|
18
|
+
pqa run scenarios/**/*.md
|
|
17
19
|
```
|
|
18
20
|
|
|
19
21
|
**New project checklist**
|
|
20
22
|
|
|
21
23
|
1. Install the package in your app repo (or globally with `npm install -g prose-qa`).
|
|
22
|
-
2.
|
|
23
|
-
3.
|
|
24
|
-
4.
|
|
24
|
+
2. install a browser `pqa install-browser chrome` or `pqa install-browser lightpanda` (headless only but way lighter, perfect for CI pipeline)
|
|
25
|
+
3. Create `pqa.config.json` — use `pqa config <key> <value>` or copy the [minimal example](docs/CONFIG.md#minimal-example).
|
|
26
|
+
4. Add scenarios under `scenarios/` (see [0_hello-world.md](scenarios/0_hello-world.md)).
|
|
25
27
|
5. Run `pqa run` or `pqa debug`.
|
|
26
28
|
|
|
27
|
-
On first install, `agent-browser` downloads its browser binary via `postinstall`. In CI:
|
|
28
|
-
|
|
29
|
-
```bash
|
|
30
|
-
npx agent-browser install --with-deps
|
|
31
|
-
```
|
|
32
|
-
|
|
33
|
-
Bundled harness assets (`prompt/`, `skills/`) ship inside the npm package. Your project only needs `pqa.config.*`, `scenarios/`, and optional `.agents/skills/` overrides.
|
|
34
|
-
|
|
35
29
|
## What you get
|
|
36
30
|
|
|
37
31
|
- **Natural language scenarios** — `# Goal`, `# Steps`, and `# Then` checkpoints ([format guide](docs/HOWTO.md#1-scenario-format-goal--steps--then--frontmatter))
|
|
38
|
-
- **Agent Skills** ([agentskills.io](https://agentskills.io/)) — Anthropic-compatible `SKILL.md` format
|
|
39
|
-
- **Pinned agent-browser skill** vendored at `skills/agent-browser/` (installed via `postinstall`)
|
|
40
32
|
- **CI + local debug** modes with HTML/JSON reports
|
|
33
|
+
- **MCP Server** to help your usual agent create scenario tailored to your codebase
|
|
41
34
|
- **Auth, cache, healing, recording, and analysis** — see [HOWTO](docs/HOWTO.md)
|
|
42
35
|
|
|
43
36
|
## Documentation
|
|
44
37
|
|
|
45
|
-
|
|
46
38
|
| Doc | Purpose |
|
|
47
39
|
| ------------------------------------------------------------ | ------------------------------------------------------------------------------------------ |
|
|
48
40
|
| [docs/HOWTO.md](docs/HOWTO.md) | Step-by-step guide: scenarios → run → CI → auth → MCP → record → cache → healing → analyze |
|
|
@@ -51,10 +43,8 @@ Bundled harness assets (`prompt/`, `skills/`) ship inside the npm package. Your
|
|
|
51
43
|
| [SECURITY.md](SECURITY.md) | Vulnerability reporting, secrets, and run artifacts |
|
|
52
44
|
| [recorder-extension/README.md](recorder-extension/README.md) | Chrome extension recorder (WIP) |
|
|
53
45
|
|
|
54
|
-
|
|
55
46
|
## CLI
|
|
56
47
|
|
|
57
|
-
|
|
58
48
|
| Command | Description |
|
|
59
49
|
| --------------------------------------------------- | -------------------------------------------------- |
|
|
60
50
|
| `pqa config <key> <value>` | Set a value in `pqa.config.json` |
|
|
@@ -67,7 +57,6 @@ Bundled harness assets (`prompt/`, `skills/`) ship inside the npm package. Your
|
|
|
67
57
|
| `pqa skills list` / `show` / `sync` | Discover and inspect agent skills |
|
|
68
58
|
| `pqa mcp` | Start MCP server (Cursor, Claude Desktop, …) |
|
|
69
59
|
|
|
70
|
-
|
|
71
60
|
Tag filters, auth refresh, retries, and cache flags: see [HOWTO §3–§4](docs/HOWTO.md#3-debug-vs-run) and [HOWTO §11](docs/HOWTO.md#11-healing--retries).
|
|
72
61
|
|
|
73
62
|
**Exit codes:** `0` pass · `1` failure · `2` config/harness error
|
|
@@ -86,26 +75,25 @@ Supported filenames (first match wins): `pqa.config.json`, `pqa.config.mjs`, `pq
|
|
|
86
75
|
}
|
|
87
76
|
```
|
|
88
77
|
|
|
89
|
-
|
|
90
78
|
| Variable | Required when |
|
|
91
79
|
| ------------------ | ---------------------------------------- |
|
|
92
80
|
| `PQA_LLM_API_KEY` | Any cloud `llm.provider` (not `ollama`) |
|
|
93
81
|
| `PQA_LLM_PROVIDER` | Optional env shortcut for `llm.provider` |
|
|
94
82
|
| `PQA_LLM_MODEL` | Optional env shortcut for `llm.model` |
|
|
95
83
|
|
|
96
|
-
|
|
97
84
|
All options, env vars, and a full example: **[docs/CONFIG.md](docs/CONFIG.md)**.
|
|
98
85
|
|
|
99
|
-
## MCP
|
|
86
|
+
## MCP
|
|
100
87
|
|
|
101
|
-
Add
|
|
88
|
+
Add the following to your `mcp.json`:
|
|
102
89
|
|
|
103
90
|
```json
|
|
104
91
|
{
|
|
105
92
|
"mcpServers": {
|
|
106
93
|
"prose-qa": {
|
|
107
94
|
"command": "npx",
|
|
108
|
-
"args": ["-y", "prose-qa", "mcp"]
|
|
95
|
+
"args": ["-y", "prose-qa", "mcp"],
|
|
96
|
+
"cwd": "/path/to/your-app-with-pqa.config"
|
|
109
97
|
}
|
|
110
98
|
}
|
|
111
99
|
}
|
|
@@ -118,16 +106,18 @@ Tools: `validate_scenario`, `run_scenario`, `get_create_pqa_scenario_skill`. Det
|
|
|
118
106
|
```bash
|
|
119
107
|
git clone https://github.com/FreakDev/Prose-QA.git
|
|
120
108
|
cd Prose-QA
|
|
121
|
-
npm ci && npm run
|
|
109
|
+
npm ci && npm run install-chrome
|
|
110
|
+
|
|
111
|
+
npm run build
|
|
122
112
|
|
|
123
113
|
export PQA_LLM_API_KEY=...
|
|
124
114
|
|
|
125
115
|
npm run demo:server # terminal 1 — http://127.0.0.1:8080/
|
|
126
|
-
npm run dev -- debug scenarios/0_hello-world.md
|
|
116
|
+
npm run dev -- debug scenarios/0_hello-world.md
|
|
127
117
|
```
|
|
128
118
|
|
|
129
119
|
See [CONTRIBUTING.md](CONTRIBUTING.md) and [docs/HOWTO.md](docs/HOWTO.md) for the full walkthrough.
|
|
130
120
|
|
|
131
121
|
## License
|
|
132
122
|
|
|
133
|
-
MIT — see [LICENSE](LICENSE).
|
|
123
|
+
MIT — see [LICENSE](LICENSE).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-options.d.ts","sourceRoot":"","sources":["../../src/agent/provider-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-options.d.ts","sourceRoot":"","sources":["../../src/agent/provider-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAmDxE;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,eAAe,GAAG,SAAS,CAgE7B"}
|
|
@@ -23,21 +23,12 @@ function resolveOpenAIReasoningEffort(config) {
|
|
|
23
23
|
return explicit;
|
|
24
24
|
return reasoningEffortFromBudget(thinkingBudget(config));
|
|
25
25
|
}
|
|
26
|
-
function geminiThinkingLevel(reasoningEffort
|
|
27
|
-
if (reasoningEffort
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (reasoningEffort === "minimal")
|
|
31
|
-
return "minimal";
|
|
32
|
-
return reasoningEffort;
|
|
33
|
-
}
|
|
34
|
-
if (budgetTokens <= 2_000)
|
|
26
|
+
function geminiThinkingLevel(reasoningEffort) {
|
|
27
|
+
if (reasoningEffort === "xhigh")
|
|
28
|
+
return "high";
|
|
29
|
+
if (reasoningEffort === "minimal")
|
|
35
30
|
return "minimal";
|
|
36
|
-
|
|
37
|
-
return "low";
|
|
38
|
-
if (budgetTokens <= 10_000)
|
|
39
|
-
return "medium";
|
|
40
|
-
return "high";
|
|
31
|
+
return reasoningEffort;
|
|
41
32
|
}
|
|
42
33
|
/** Map config effort to Anthropic `effort` (none/minimal are omitted). */
|
|
43
34
|
function anthropicEffort(reasoningEffort) {
|
|
@@ -62,7 +53,7 @@ export function buildProviderOptions(config) {
|
|
|
62
53
|
return undefined;
|
|
63
54
|
}
|
|
64
55
|
const budget = thinkingBudget(config);
|
|
65
|
-
const reasoningEffort = config.llm.thinking?.reasoningEffort;
|
|
56
|
+
const reasoningEffort = config.llm.thinking?.reasoningEffort ?? "none";
|
|
66
57
|
switch (config.llm.provider) {
|
|
67
58
|
case "anthropic": {
|
|
68
59
|
const effort = anthropicEffort(reasoningEffort);
|
|
@@ -86,16 +77,19 @@ export function buildProviderOptions(config) {
|
|
|
86
77
|
thinking: { type: "enabled", budgetTokens: budget },
|
|
87
78
|
},
|
|
88
79
|
};
|
|
89
|
-
case "google":
|
|
80
|
+
case "google": {
|
|
81
|
+
const thinkingLevel = reasoningEffort !== "none"
|
|
82
|
+
? geminiThinkingLevel(reasoningEffort)
|
|
83
|
+
: undefined;
|
|
90
84
|
return {
|
|
91
85
|
google: {
|
|
92
86
|
thinkingConfig: {
|
|
93
87
|
includeThoughts: true,
|
|
94
|
-
|
|
95
|
-
thinkingLevel: geminiThinkingLevel(reasoningEffort, budget),
|
|
88
|
+
...(thinkingLevel != null && { thinkingLevel }),
|
|
96
89
|
},
|
|
97
90
|
},
|
|
98
91
|
};
|
|
92
|
+
}
|
|
99
93
|
case "ollama":
|
|
100
94
|
return {
|
|
101
95
|
ollama: { think: true },
|
|
@@ -103,7 +97,7 @@ export function buildProviderOptions(config) {
|
|
|
103
97
|
case "openrouter":
|
|
104
98
|
return {
|
|
105
99
|
openrouter: {
|
|
106
|
-
reasoning: reasoningEffort
|
|
100
|
+
reasoning: reasoningEffort !== "none"
|
|
107
101
|
? { effort: reasoningEffort }
|
|
108
102
|
: { max_tokens: budget },
|
|
109
103
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-options.js","sourceRoot":"","sources":["../../src/agent/provider-options.ts"],"names":[],"mappings":"AAGA,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAIvC,SAAS,cAAc,CAAC,MAAiB;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,uBAAuB,CAAC;AACtE,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAiB;IAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;AAC/C,CAAC;AAED,wFAAwF;AACxF,SAAS,yBAAyB,CAAC,YAAoB;IACrD,IAAI,YAAY,IAAI,KAAK;QAAE,OAAO,SAAS,CAAC;IAC5C,IAAI,YAAY,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,YAAY,IAAI,MAAM;QAAE,OAAO,QAAQ,CAAC;IAC5C,IAAI,YAAY,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,4BAA4B,CAAC,MAAiB;IACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC;IACtD,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,CAAC;IACtC,OAAO,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3D,CAAC;AAID,SAAS,mBAAmB,CAC1B,
|
|
1
|
+
{"version":3,"file":"provider-options.js","sourceRoot":"","sources":["../../src/agent/provider-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ describe("buildProviderOptions", () => {
|
|
|
74
74
|
},
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
|
-
it("enables google thinking config", () => {
|
|
77
|
+
it("enables google thinking config with explicit reasoningEffort", () => {
|
|
78
78
|
assert.deepEqual(buildProviderOptions(config("google", {
|
|
79
79
|
enabled: true,
|
|
80
80
|
budgetTokens: 8_000,
|
|
@@ -83,12 +83,22 @@ describe("buildProviderOptions", () => {
|
|
|
83
83
|
google: {
|
|
84
84
|
thinkingConfig: {
|
|
85
85
|
includeThoughts: true,
|
|
86
|
-
thinkingBudget: 8_000,
|
|
87
86
|
thinkingLevel: "high",
|
|
88
87
|
},
|
|
89
88
|
},
|
|
90
89
|
});
|
|
91
90
|
});
|
|
91
|
+
it("omits google thinkingLevel when reasoningEffort is none or unset", () => {
|
|
92
|
+
const expected = {
|
|
93
|
+
google: {
|
|
94
|
+
thinkingConfig: {
|
|
95
|
+
includeThoughts: true,
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
assert.deepEqual(buildProviderOptions(config("google", { enabled: true })), expected);
|
|
100
|
+
assert.deepEqual(buildProviderOptions(config("google", { enabled: true, reasoningEffort: "none" })), expected);
|
|
101
|
+
});
|
|
92
102
|
it("enables ollama think mode", () => {
|
|
93
103
|
assert.deepEqual(buildProviderOptions(config("ollama", { enabled: true })), { ollama: { think: true } });
|
|
94
104
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-options.test.js","sourceRoot":"","sources":["../../src/agent/provider-options.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"provider-options.test.js","sourceRoot":"","sources":["../../src/agent/provider-options.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAIV,cAAc,EACd,OAAO,EACR,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAIV,cAAc,EACd,OAAO,EACR,MAAM,qBAAqB,CAAC;AA+B7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAsC5D,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,aAAa,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAkED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC,CAiXzB;AAED,YAAY,EAAE,OAAO,EAAE,CAAC"}
|
package/dist/agent/runner.js
CHANGED
|
@@ -8,7 +8,7 @@ import { buildInitialPrompt, buildSystemPrompt } from "./prompt.js";
|
|
|
8
8
|
import { SkillLoadRegistry, formatAutoLoadedMessage, inferAutoSkillLoads, } from "../skills/on-demand.js";
|
|
9
9
|
import { buildVerdictRetryPrompt } from "./verdict-retry-prompt.js";
|
|
10
10
|
import { persistTranscript } from "./transcript-persist.js";
|
|
11
|
-
import { appendFinalTextToTranscript, appendStepToTranscript, appendTranscriptMessage, enrichVerdictWithStats, extractVerdict, formatStepForTranscript, stripLastAssistantTurn, } from "./verdict.js";
|
|
11
|
+
import { addLanguageModelUsage, appendFinalTextToTranscript, appendStepToTranscript, appendTranscriptMessage, emptyTokenUsage, enrichVerdictWithStats, extractVerdict, formatStepForTranscript, stripLastAssistantTurn, } from "./verdict.js";
|
|
12
12
|
import { resolveStatePath } from "../auth/store.js";
|
|
13
13
|
import { createLlmModel } from "./llm-model.js";
|
|
14
14
|
import { buildProviderOptions } from "./provider-options.js";
|
|
@@ -22,6 +22,7 @@ function finalizeVerdict(verdict, transcript, options) {
|
|
|
22
22
|
return enrichVerdictWithStats(redacted, transcript, {
|
|
23
23
|
durationMs: options.durationMs,
|
|
24
24
|
healing: options.healing,
|
|
25
|
+
tokens: options.tokens,
|
|
25
26
|
});
|
|
26
27
|
}
|
|
27
28
|
function removeLastAssistantMessage(transcript) {
|
|
@@ -34,7 +35,7 @@ function removeLastAssistantMessage(transcript) {
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
async function retryVerdictCompletion(options) {
|
|
37
|
-
let { result, finalText } = options;
|
|
38
|
+
let { result, finalText, tokenUsage } = options;
|
|
38
39
|
for (let attempt = 0; !extractVerdict(finalText) && attempt < MAX_VERDICT_RETRIES; attempt++) {
|
|
39
40
|
removeLastAssistantMessage(options.transcript);
|
|
40
41
|
const retryPrompt = buildVerdictRetryPrompt(options.runOptions.scenario);
|
|
@@ -53,6 +54,7 @@ async function retryVerdictCompletion(options) {
|
|
|
53
54
|
stopWhen: stepCountIs(VERDICT_RETRY_MAX_STEPS),
|
|
54
55
|
onStepFinish: options.onStepFinish,
|
|
55
56
|
});
|
|
57
|
+
tokenUsage = addLanguageModelUsage(tokenUsage, result.totalUsage);
|
|
56
58
|
finalText = result.text || finalText;
|
|
57
59
|
appendFinalTextToTranscript(options.transcript, options.runOptions.redactor
|
|
58
60
|
? options.runOptions.redactor.redact(finalText)
|
|
@@ -60,7 +62,7 @@ async function retryVerdictCompletion(options) {
|
|
|
60
62
|
options.stepTiming.startMs = Date.now();
|
|
61
63
|
persistTranscript(options.runOptions, options.transcript);
|
|
62
64
|
}
|
|
63
|
-
return { result, finalText };
|
|
65
|
+
return { result, finalText, tokenUsage };
|
|
64
66
|
}
|
|
65
67
|
export async function runScenario(options) {
|
|
66
68
|
const start = Date.now();
|
|
@@ -94,6 +96,7 @@ export async function runScenario(options) {
|
|
|
94
96
|
});
|
|
95
97
|
let finalText = "";
|
|
96
98
|
let turn = 0;
|
|
99
|
+
let tokenUsage = emptyTokenUsage();
|
|
97
100
|
const stepTiming = { startMs: Date.now() };
|
|
98
101
|
const pendingBashEntries = [];
|
|
99
102
|
const onDemandEnabled = options.config.skills.onDemand?.enabled !== false;
|
|
@@ -229,11 +232,12 @@ export async function runScenario(options) {
|
|
|
229
232
|
stopWhen: stepCountIs(options.config.agent.maxTurns),
|
|
230
233
|
onStepFinish,
|
|
231
234
|
}));
|
|
235
|
+
tokenUsage = addLanguageModelUsage(tokenUsage, result.totalUsage);
|
|
232
236
|
finalText = result.text || finalText;
|
|
233
237
|
appendFinalTextToTranscript(transcript, options.redactor ? options.redactor.redact(finalText) : finalText, { durationMs: Date.now() - stepTiming.startMs });
|
|
234
238
|
stepTiming.startMs = Date.now();
|
|
235
239
|
persistTranscript(options, transcript);
|
|
236
|
-
({ result, finalText } = await retryVerdictCompletion({
|
|
240
|
+
({ result, finalText, tokenUsage } = await retryVerdictCompletion({
|
|
237
241
|
config: options.config,
|
|
238
242
|
system,
|
|
239
243
|
providerOptions,
|
|
@@ -243,6 +247,7 @@ export async function runScenario(options) {
|
|
|
243
247
|
onStepFinish,
|
|
244
248
|
finalText,
|
|
245
249
|
stepTiming,
|
|
250
|
+
tokenUsage,
|
|
246
251
|
}));
|
|
247
252
|
let verdict = extractVerdict(finalText);
|
|
248
253
|
const healingMeta = {
|
|
@@ -259,6 +264,7 @@ export async function runScenario(options) {
|
|
|
259
264
|
durationMs: Date.now() - start,
|
|
260
265
|
healing: healingMeta,
|
|
261
266
|
redactor: options.redactor,
|
|
267
|
+
tokens: tokenUsage,
|
|
262
268
|
}),
|
|
263
269
|
transcript,
|
|
264
270
|
artifactDir: options.artifactDir,
|
|
@@ -293,11 +299,12 @@ export async function runScenario(options) {
|
|
|
293
299
|
stopWhen: stepCountIs(options.config.agent.maxTurns),
|
|
294
300
|
onStepFinish,
|
|
295
301
|
}));
|
|
302
|
+
tokenUsage = addLanguageModelUsage(tokenUsage, result.totalUsage);
|
|
296
303
|
finalText = result.text || finalText;
|
|
297
304
|
appendFinalTextToTranscript(transcript, options.redactor ? options.redactor.redact(finalText) : finalText, { durationMs: Date.now() - stepTiming.startMs });
|
|
298
305
|
stepTiming.startMs = Date.now();
|
|
299
306
|
persistTranscript(options, transcript);
|
|
300
|
-
({ result, finalText } = await retryVerdictCompletion({
|
|
307
|
+
({ result, finalText, tokenUsage } = await retryVerdictCompletion({
|
|
301
308
|
config: options.config,
|
|
302
309
|
system,
|
|
303
310
|
providerOptions,
|
|
@@ -307,6 +314,7 @@ export async function runScenario(options) {
|
|
|
307
314
|
onStepFinish,
|
|
308
315
|
finalText,
|
|
309
316
|
stepTiming,
|
|
317
|
+
tokenUsage,
|
|
310
318
|
}));
|
|
311
319
|
verdict = extractVerdict(finalText);
|
|
312
320
|
healingMeta.recoveryTurns += 1;
|
|
@@ -317,6 +325,7 @@ export async function runScenario(options) {
|
|
|
317
325
|
durationMs: Date.now() - start,
|
|
318
326
|
healing: healingMeta,
|
|
319
327
|
redactor: options.redactor,
|
|
328
|
+
tokens: tokenUsage,
|
|
320
329
|
}),
|
|
321
330
|
error: verdict
|
|
322
331
|
? undefined
|
package/dist/agent/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/verdict.d.ts
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
import type { ModelMessage } from "ai";
|
|
2
|
-
import { type AgentTranscript, type BashEntry, type HealingMeta, type ParsedVerdict, type TranscriptBashEntry, type TranscriptMessageEntry, type Verdict, type VerdictStats } from "../types/verdict.js";
|
|
1
|
+
import type { LanguageModelUsage, ModelMessage } from "ai";
|
|
2
|
+
import { type AgentTranscript, type BashEntry, type HealingMeta, type ParsedVerdict, type TokenUsageStats, type TranscriptBashEntry, type TranscriptMessageEntry, type Verdict, type VerdictStats } from "../types/verdict.js";
|
|
3
|
+
export declare function emptyTokenUsage(): TokenUsageStats;
|
|
4
|
+
export declare function addLanguageModelUsage(acc: TokenUsageStats, usage: LanguageModelUsage | undefined): TokenUsageStats;
|
|
3
5
|
/** Drop the last assistant turn (and trailing tool results) so the model can redo that completion. */
|
|
4
6
|
export declare function stripLastAssistantTurn(messages: ModelMessage[]): ModelMessage[];
|
|
5
7
|
export declare function extractVerdict(text: string): ParsedVerdict | null;
|
|
6
8
|
export interface TranscriptStatsOptions {
|
|
7
9
|
durationMs?: number;
|
|
8
10
|
healing?: HealingMeta;
|
|
11
|
+
tokens?: TokenUsageStats;
|
|
9
12
|
}
|
|
10
13
|
export declare function computeTranscriptStats(transcript: AgentTranscript, options?: TranscriptStatsOptions): VerdictStats;
|
|
11
14
|
export declare function enrichVerdictWithStats(verdict: ParsedVerdict | Verdict | null, transcript: AgentTranscript, options?: TranscriptStatsOptions): Verdict | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../src/agent/verdict.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../src/agent/verdict.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC3D,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,OAAO,EACZ,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,eAAe,IAAI,eAAe,CAEjD;AAQD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,kBAAkB,GAAG,SAAS,GACpC,eAAe,CAcjB;AAED,sGAAsG;AACtG,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CAS/E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAmCjE;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAC3B,OAAO,GAAE,sBAA2B,GACnC,YAAY,CAoDd;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,aAAa,GAAG,OAAO,GAAG,IAAI,EACvC,UAAU,EAAE,eAAe,EAC3B,OAAO,GAAE,sBAA2B,GACnC,OAAO,GAAG,IAAI,CAUhB;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,eAAe,GAC1B,sBAAsB,EAAE,CAI1B;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,eAAe,GAC1B,mBAAmB,EAAE,CAIvB;AAaD,MAAM,WAAW,qBAAqB;IACpC,EAAE,CAAC,EAAE,IAAI,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,eAAe,EAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,qBAAqB,GAC7B,IAAI,CAUN;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,GACzC,IAAI,CAMN;AAED,iFAAiF;AACjF,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,qBAAqB,GAC7B,IAAI,CAKN;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,mBAAmB,GACxB,uBAAuB,CAgBzB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAC3B,IAAI,EAAE,mBAAmB,EACzB,WAAW,GAAE,SAAS,EAAO,EAC7B,iBAAiB,CAAC,EAAE,uBAAuB,EAC3C,MAAM,CAAC,EAAE,qBAAqB,GAC7B,OAAO,CAmBT"}
|
package/dist/agent/verdict.js
CHANGED
|
@@ -1,4 +1,26 @@
|
|
|
1
1
|
import { VerdictSchema, } from "../types/verdict.js";
|
|
2
|
+
export function emptyTokenUsage() {
|
|
3
|
+
return { input: 0, output: 0 };
|
|
4
|
+
}
|
|
5
|
+
function cachedTokensFromUsage(usage) {
|
|
6
|
+
return (usage.inputTokenDetails?.cacheReadTokens ?? usage.cachedInputTokens);
|
|
7
|
+
}
|
|
8
|
+
export function addLanguageModelUsage(acc, usage) {
|
|
9
|
+
if (!usage)
|
|
10
|
+
return acc;
|
|
11
|
+
const next = {
|
|
12
|
+
input: acc.input + (usage.inputTokens ?? 0),
|
|
13
|
+
output: acc.output + (usage.outputTokens ?? 0),
|
|
14
|
+
};
|
|
15
|
+
const stepCached = cachedTokensFromUsage(usage);
|
|
16
|
+
if (stepCached !== undefined) {
|
|
17
|
+
next.cached = (acc.cached ?? 0) + stepCached;
|
|
18
|
+
}
|
|
19
|
+
else if (acc.cached !== undefined) {
|
|
20
|
+
next.cached = acc.cached;
|
|
21
|
+
}
|
|
22
|
+
return next;
|
|
23
|
+
}
|
|
2
24
|
/** Drop the last assistant turn (and trailing tool results) so the model can redo that completion. */
|
|
3
25
|
export function stripLastAssistantTurn(messages) {
|
|
4
26
|
let end = messages.length;
|
|
@@ -84,14 +106,24 @@ export function computeTranscriptStats(transcript, options = {}) {
|
|
|
84
106
|
scenarioRetries: options.healing.scenarioRetries,
|
|
85
107
|
};
|
|
86
108
|
}
|
|
109
|
+
if (options.tokens &&
|
|
110
|
+
(options.tokens.input > 0 ||
|
|
111
|
+
options.tokens.output > 0 ||
|
|
112
|
+
(options.tokens.cached ?? 0) > 0)) {
|
|
113
|
+
stats.tokens = options.tokens;
|
|
114
|
+
}
|
|
87
115
|
return stats;
|
|
88
116
|
}
|
|
89
117
|
export function enrichVerdictWithStats(verdict, transcript, options = {}) {
|
|
90
118
|
if (!verdict)
|
|
91
119
|
return null;
|
|
120
|
+
const existingTokens = "stats" in verdict ? verdict.stats?.tokens : undefined;
|
|
92
121
|
return {
|
|
93
122
|
...verdict,
|
|
94
|
-
stats: computeTranscriptStats(transcript,
|
|
123
|
+
stats: computeTranscriptStats(transcript, {
|
|
124
|
+
...options,
|
|
125
|
+
tokens: options.tokens ?? existingTokens,
|
|
126
|
+
}),
|
|
95
127
|
};
|
|
96
128
|
}
|
|
97
129
|
export function getTranscriptMessages(transcript) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verdict.js","sourceRoot":"","sources":["../../src/agent/verdict.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,
|
|
1
|
+
{"version":3,"file":"verdict.js","sourceRoot":"","sources":["../../src/agent/verdict.ts"],"names":[],"mappings":"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"}
|