@mobrienv/autoloop 0.1.4 → 0.2.0
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 +13 -0
- package/bin/autoloop +0 -0
- package/dist/agent-map.d.ts +10 -0
- package/dist/agent-map.js +58 -0
- package/dist/agent-map.js.map +1 -0
- package/dist/backend/acp-client.d.ts +32 -0
- package/dist/backend/acp-client.js +210 -0
- package/dist/backend/acp-client.js.map +1 -0
- package/dist/backend/index.d.ts +1 -1
- package/dist/backend/index.js +17 -5
- package/dist/backend/index.js.map +1 -1
- package/dist/backend/kiro-bridge.d.ts +17 -0
- package/dist/backend/kiro-bridge.js +80 -0
- package/dist/backend/kiro-bridge.js.map +1 -0
- package/dist/backend/kiro-worker.d.ts +1 -0
- package/dist/backend/kiro-worker.js +83 -0
- package/dist/backend/kiro-worker.js.map +1 -0
- package/dist/backend/run-command.js +2 -2
- package/dist/backend/run-command.js.map +1 -1
- package/dist/backend/run-kiro.d.ts +3 -0
- package/dist/backend/run-kiro.js +12 -0
- package/dist/backend/run-kiro.js.map +1 -0
- package/dist/backend/run-pi.js.map +1 -1
- package/dist/chains/budget.js +16 -4
- package/dist/chains/budget.js.map +1 -1
- package/dist/chains/load.d.ts +7 -1
- package/dist/chains/load.js +58 -9
- package/dist/chains/load.js.map +1 -1
- package/dist/chains/render.js +36 -8
- package/dist/chains/render.js.map +1 -1
- package/dist/chains/run.js +129 -44
- package/dist/chains/run.js.map +1 -1
- package/dist/chains/types.d.ts +1 -0
- package/dist/chains.d.ts +5 -4
- package/dist/chains.js +3 -3
- package/dist/chains.js.map +1 -1
- package/dist/commands/chain.js +6 -4
- package/dist/commands/chain.js.map +1 -1
- package/dist/commands/config.d.ts +1 -0
- package/dist/commands/config.js +74 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/dashboard.d.ts +1 -0
- package/dist/commands/dashboard.js +68 -0
- package/dist/commands/dashboard.js.map +1 -0
- package/dist/commands/inspect.js +125 -17
- package/dist/commands/inspect.js.map +1 -1
- package/dist/commands/list.d.ts +1 -1
- package/dist/commands/list.js +6 -3
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/loops.js +11 -11
- package/dist/commands/loops.js.map +1 -1
- package/dist/commands/memory.js +2 -2
- package/dist/commands/memory.js.map +1 -1
- package/dist/commands/run.d.ts +1 -1
- package/dist/commands/run.js +102 -15
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/runs.d.ts +1 -0
- package/dist/commands/runs.js +50 -0
- package/dist/commands/runs.js.map +1 -0
- package/dist/commands/task.d.ts +1 -0
- package/dist/commands/task.js +74 -0
- package/dist/commands/task.js.map +1 -0
- package/dist/commands/worktree.d.ts +1 -0
- package/dist/commands/worktree.js +162 -0
- package/dist/commands/worktree.js.map +1 -0
- package/dist/config.d.ts +15 -1
- package/dist/config.js +90 -21
- package/dist/config.js.map +1 -1
- package/dist/dashboard/app.d.ts +12 -0
- package/dist/dashboard/app.js +23 -0
- package/dist/dashboard/app.js.map +1 -0
- package/dist/dashboard/routes/api.d.ts +3 -0
- package/dist/dashboard/routes/api.js +103 -0
- package/dist/dashboard/routes/api.js.map +1 -0
- package/dist/dashboard/routes/pages.d.ts +2 -0
- package/dist/dashboard/routes/pages.js +14 -0
- package/dist/dashboard/routes/pages.js.map +1 -0
- package/dist/dashboard/views/alpine-vendor.d.ts +1 -0
- package/dist/dashboard/views/alpine-vendor.js +10 -0
- package/dist/dashboard/views/alpine-vendor.js.map +1 -0
- package/dist/dashboard/views/shell.d.ts +1 -0
- package/dist/dashboard/views/shell.js +714 -0
- package/dist/dashboard/views/shell.js.map +1 -0
- package/dist/events/decode.js.map +1 -1
- package/dist/events/encode.js +2 -2
- package/dist/events/encode.js.map +1 -1
- package/dist/harness/config-helpers.d.ts +11 -0
- package/dist/harness/config-helpers.js +242 -64
- package/dist/harness/config-helpers.js.map +1 -1
- package/dist/harness/coordination.js +12 -12
- package/dist/harness/coordination.js.map +1 -1
- package/dist/harness/display.d.ts +4 -3
- package/dist/harness/display.js +57 -11
- package/dist/harness/display.js.map +1 -1
- package/dist/harness/emit.js +31 -13
- package/dist/harness/emit.js.map +1 -1
- package/dist/harness/index.d.ts +7 -7
- package/dist/harness/index.js +151 -35
- package/dist/harness/index.js.map +1 -1
- package/dist/harness/iteration.d.ts +12 -0
- package/dist/harness/iteration.js +66 -64
- package/dist/harness/iteration.js.map +1 -1
- package/dist/harness/journal.d.ts +17 -0
- package/dist/harness/journal.js +74 -5
- package/dist/harness/journal.js.map +1 -1
- package/dist/harness/metareview.js +30 -15
- package/dist/harness/metareview.js.map +1 -1
- package/dist/harness/metrics.js +12 -12
- package/dist/harness/metrics.js.map +1 -1
- package/dist/harness/parallel.d.ts +1 -1
- package/dist/harness/parallel.js +141 -62
- package/dist/harness/parallel.js.map +1 -1
- package/dist/harness/prompt.d.ts +18 -9
- package/dist/harness/prompt.js +80 -44
- package/dist/harness/prompt.js.map +1 -1
- package/dist/harness/scratchpad.js +8 -6
- package/dist/harness/scratchpad.js.map +1 -1
- package/dist/harness/stop.js +16 -9
- package/dist/harness/stop.js.map +1 -1
- package/dist/harness/tools.js +39 -13
- package/dist/harness/tools.js.map +1 -1
- package/dist/harness/types.d.ts +29 -0
- package/dist/harness/wave/finalize-wave.d.ts +1 -1
- package/dist/harness/wave/finalize-wave.js +36 -9
- package/dist/harness/wave/finalize-wave.js.map +1 -1
- package/dist/harness/wave/launch-branches.d.ts +2 -2
- package/dist/harness/wave/launch-branches.js +147 -51
- package/dist/harness/wave/launch-branches.js.map +1 -1
- package/dist/harness/wave/parse-objectives.js +4 -1
- package/dist/harness/wave/parse-objectives.js.map +1 -1
- package/dist/harness/wave.d.ts +2 -2
- package/dist/harness/wave.js +89 -28
- package/dist/harness/wave.js.map +1 -1
- package/dist/isolation/index.d.ts +4 -0
- package/dist/isolation/index.js +3 -0
- package/dist/isolation/index.js.map +1 -0
- package/dist/isolation/resolve.d.ts +39 -0
- package/dist/isolation/resolve.js +118 -0
- package/dist/isolation/resolve.js.map +1 -0
- package/dist/isolation/run-scope.d.ts +21 -0
- package/dist/isolation/run-scope.js +50 -0
- package/dist/isolation/run-scope.js.map +1 -0
- package/dist/json.js +10 -8
- package/dist/json.js.map +1 -1
- package/dist/loops/health.d.ts +4 -2
- package/dist/loops/health.js +73 -25
- package/dist/loops/health.js.map +1 -1
- package/dist/loops/list.d.ts +2 -2
- package/dist/loops/list.js +6 -6
- package/dist/loops/list.js.map +1 -1
- package/dist/loops/policy.d.ts +6 -0
- package/dist/loops/policy.js +41 -0
- package/dist/loops/policy.js.map +1 -0
- package/dist/loops/render.d.ts +2 -1
- package/dist/loops/render.js +24 -11
- package/dist/loops/render.js.map +1 -1
- package/dist/loops/show.d.ts +2 -2
- package/dist/loops/show.js +13 -13
- package/dist/loops/show.js.map +1 -1
- package/dist/loops/watch.d.ts +7 -1
- package/dist/loops/watch.js +82 -16
- package/dist/loops/watch.js.map +1 -1
- package/dist/main.js +48 -11
- package/dist/main.js.map +1 -1
- package/dist/markdown.js +11 -11
- package/dist/markdown.js.map +1 -1
- package/dist/memory-render.js +5 -5
- package/dist/memory-render.js.map +1 -1
- package/dist/memory.d.ts +1 -2
- package/dist/memory.js +44 -40
- package/dist/memory.js.map +1 -1
- package/dist/pi-adapter.js +11 -11
- package/dist/pi-adapter.js.map +1 -1
- package/dist/profiles.d.ts +12 -0
- package/dist/profiles.js +71 -0
- package/dist/profiles.js.map +1 -0
- package/dist/registry/derive.js +10 -3
- package/dist/registry/derive.js.map +1 -1
- package/dist/registry/discover.d.ts +20 -0
- package/dist/registry/discover.js +98 -0
- package/dist/registry/discover.js.map +1 -0
- package/dist/registry/harness.js +8 -2
- package/dist/registry/harness.js.map +1 -1
- package/dist/registry/index.d.ts +4 -3
- package/dist/registry/index.js +3 -2
- package/dist/registry/index.js.map +1 -1
- package/dist/registry/read.js.map +1 -1
- package/dist/registry/rebuild.js +7 -4
- package/dist/registry/rebuild.js.map +1 -1
- package/dist/registry/types.d.ts +9 -0
- package/dist/registry/update.js +1 -1
- package/dist/registry/update.js.map +1 -1
- package/dist/tasks-render.d.ts +2 -0
- package/dist/tasks-render.js +44 -0
- package/dist/tasks-render.js.map +1 -0
- package/dist/tasks.d.ts +24 -0
- package/dist/tasks.js +184 -0
- package/dist/tasks.js.map +1 -0
- package/dist/testing/mock-backend.js +2 -2
- package/dist/testing/mock-backend.js.map +1 -1
- package/dist/topology.d.ts +6 -0
- package/dist/topology.js +129 -8
- package/dist/topology.js.map +1 -1
- package/dist/usage.d.ts +1 -0
- package/dist/usage.js +56 -11
- package/dist/usage.js.map +1 -1
- package/dist/utils.d.ts +6 -0
- package/dist/utils.js +272 -2
- package/dist/utils.js.map +1 -1
- package/dist/worktree/clean.d.ts +12 -0
- package/dist/worktree/clean.js +98 -0
- package/dist/worktree/clean.js.map +1 -0
- package/dist/worktree/create.d.ts +14 -0
- package/dist/worktree/create.js +71 -0
- package/dist/worktree/create.js.map +1 -0
- package/dist/worktree/index.d.ts +10 -0
- package/dist/worktree/index.js +6 -0
- package/dist/worktree/index.js.map +1 -0
- package/dist/worktree/list.d.ts +9 -0
- package/dist/worktree/list.js +24 -0
- package/dist/worktree/list.js.map +1 -0
- package/dist/worktree/merge.d.ts +11 -0
- package/dist/worktree/merge.js +129 -0
- package/dist/worktree/merge.js.map +1 -0
- package/dist/worktree/meta.d.ts +17 -0
- package/dist/worktree/meta.js +34 -0
- package/dist/worktree/meta.js.map +1 -0
- package/package.json +24 -4
- package/presets/autocode/README.md +1 -1
- package/presets/autocode/autoloops.toml +9 -1
- package/presets/autocode/harness.md +12 -5
- package/presets/autocode/roles/build.md +5 -4
- package/presets/autocode/roles/critic.md +2 -2
- package/presets/autocode/roles/finalizer.md +2 -2
- package/presets/autocode/roles/planner.md +7 -7
- package/presets/autodoc/README.md +1 -1
- package/presets/autodoc/autoloops.toml +1 -1
- package/presets/autodoc/harness.md +6 -6
- package/presets/autodoc/roles/auditor.md +3 -3
- package/presets/autodoc/roles/checker.md +2 -2
- package/presets/autodoc/roles/publisher.md +3 -3
- package/presets/autodoc/roles/writer.md +4 -4
- package/presets/autofix/README.md +1 -1
- package/presets/autofix/autoloops.toml +5 -2
- package/presets/autofix/harness.md +8 -7
- package/presets/autofix/roles/closer.md +4 -4
- package/presets/autofix/roles/diagnoser.md +6 -5
- package/presets/autofix/roles/fixer.md +4 -4
- package/presets/autofix/roles/verifier.md +2 -2
- package/presets/autoideas/README.md +1 -1
- package/presets/autoideas/autoloops.toml +1 -1
- package/presets/autoideas/harness.md +11 -11
- package/presets/autoideas/roles/analyst.md +4 -4
- package/presets/autoideas/roles/reviewer.md +3 -3
- package/presets/autoideas/roles/scanner.md +3 -3
- package/presets/autoideas/roles/synthesizer.md +20 -7
- package/presets/automerge/README.md +3 -0
- package/presets/automerge/autoloops.toml +12 -0
- package/presets/automerge/harness.md +10 -0
- package/presets/automerge/miniloops.toml +12 -0
- package/presets/automerge/roles/merge.md +10 -0
- package/presets/automerge/topology.toml +10 -0
- package/presets/autoperf/README.md +1 -1
- package/presets/autoperf/autoloops.toml +1 -1
- package/presets/autoperf/harness.md +5 -5
- package/presets/autoperf/roles/judge.md +3 -3
- package/presets/autoperf/roles/measurer.md +4 -4
- package/presets/autoperf/roles/optimizer.md +4 -4
- package/presets/autoperf/roles/profiler.md +4 -4
- package/presets/autopr/README.md +99 -0
- package/presets/autopr/autoloops.toml +22 -0
- package/presets/autopr/harness.md +27 -0
- package/presets/autopr/miniloops.toml +22 -0
- package/presets/autopr/roles/collector.md +55 -0
- package/presets/autopr/roles/drafter.md +38 -0
- package/presets/autopr/roles/publisher.md +28 -0
- package/presets/autopr/roles/validator.md +31 -0
- package/presets/autopr/topology.toml +32 -0
- package/presets/autoqa/README.md +1 -1
- package/presets/autoqa/autoloops.toml +1 -1
- package/presets/autoqa/harness.md +10 -10
- package/presets/autoqa/roles/executor.md +3 -3
- package/presets/autoqa/roles/inspector.md +2 -2
- package/presets/autoqa/roles/planner.md +6 -6
- package/presets/autoqa/roles/reporter.md +9 -9
- package/presets/autoresearch/README.md +1 -1
- package/presets/autoresearch/autoloops.toml +1 -1
- package/presets/autoresearch/harness.md +5 -5
- package/presets/autoresearch/roles/benchmarker.md +3 -3
- package/presets/autoresearch/roles/evaluator.md +5 -5
- package/presets/autoresearch/roles/implementer.md +4 -4
- package/presets/autoresearch/roles/strategist.md +6 -6
- package/presets/autoreview/README.md +1 -1
- package/presets/autoreview/autoloops.toml +1 -1
- package/presets/autoreview/harness.md +5 -5
- package/presets/autoreview/roles/checker.md +4 -4
- package/presets/autoreview/roles/reader.md +5 -5
- package/presets/autoreview/roles/suggester.md +4 -4
- package/presets/autoreview/roles/summarizer.md +4 -4
- package/presets/autosec/README.md +1 -1
- package/presets/autosec/autoloops.toml +1 -1
- package/presets/autosec/harness.md +5 -5
- package/presets/autosec/roles/analyst.md +4 -4
- package/presets/autosec/roles/hardener.md +2 -2
- package/presets/autosec/roles/reporter.md +4 -4
- package/presets/autosec/roles/scanner.md +3 -3
- package/presets/autosimplify/README.md +1 -1
- package/presets/autosimplify/autoloops.toml +7 -3
- package/presets/autosimplify/harness.md +7 -7
- package/presets/autosimplify/roles/reviewer.md +3 -3
- package/presets/autosimplify/roles/scoper.md +7 -7
- package/presets/autosimplify/roles/simplifier.md +4 -4
- package/presets/autosimplify/roles/verifier.md +3 -3
- package/presets/autospec/README.md +1 -1
- package/presets/autospec/autoloops.toml +1 -1
- package/presets/autospec/harness.md +6 -6
- package/presets/autospec/roles/clarifier.md +4 -3
- package/presets/autospec/roles/critic.md +1 -1
- package/presets/autospec/roles/designer.md +3 -3
- package/presets/autospec/roles/planner.md +2 -2
- package/presets/autospec/roles/researcher.md +3 -3
- package/presets/autotest/README.md +1 -1
- package/presets/autotest/autoloops.toml +1 -1
- package/presets/autotest/harness.md +6 -6
- package/presets/autotest/roles/assessor.md +3 -3
- package/presets/autotest/roles/runner.md +2 -2
- package/presets/autotest/roles/surveyor.md +4 -4
- package/presets/autotest/roles/writer.md +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,3 +2,15 @@ import type { IterationContext } from "./prompt.js";
|
|
|
2
2
|
import type { LoopContext, RunSummary } from "./types.js";
|
|
3
3
|
export declare function runIteration(loop: LoopContext, iteration: number, iterate: (loop: LoopContext, iteration: number) => RunSummary): RunSummary;
|
|
4
4
|
export declare function finishIteration(loop: LoopContext, iter: IterationContext, output: string, iterate: (loop: LoopContext, iteration: number) => RunSummary): RunSummary;
|
|
5
|
+
export declare function resolveOutcome(ctx: {
|
|
6
|
+
emittedTopic: string;
|
|
7
|
+
allTopics: string[];
|
|
8
|
+
hadInvalidEvents: boolean;
|
|
9
|
+
output: string;
|
|
10
|
+
completionEvent: string;
|
|
11
|
+
requiredEvents: string[];
|
|
12
|
+
completionPromise: string;
|
|
13
|
+
}): {
|
|
14
|
+
action: string;
|
|
15
|
+
outcome: string;
|
|
16
|
+
};
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
+
import { runKiroIterationSync, setKiroSessionMode, } from "../backend/kiro-bridge.js";
|
|
2
|
+
import { registryProgress } from "../registry/harness.js";
|
|
1
3
|
import { listText } from "../utils.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
+
import { log, printBackendOutputTail, printIterationBanner, printIterationFooter, printProgressLine, } from "./display.js";
|
|
5
|
+
import { appendInvalidEvent, invalidEvent, parallelTriggerTopic, systemTopic, } from "./emit.js";
|
|
6
|
+
import { extractField, extractIteration, extractTopic, readRunLines, } from "./journal.js";
|
|
7
|
+
import { appendBackendFinish, appendBackendStart, appendIterationFinish, appendIterationStart, buildBackendCommand, runProcess, } from "./parallel.js";
|
|
4
8
|
import { buildIterationContext } from "./prompt.js";
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import { buildBackendCommand, appendIterationStart, appendBackendStart, appendBackendFinish, appendIterationFinish, runProcess, } from "./parallel.js";
|
|
8
|
-
import { stopBackendFailed, stopBackendTimeout, completeLoop } from "./stop.js";
|
|
9
|
-
import { registryProgress } from "../registry/harness.js";
|
|
9
|
+
import { completeLoop, stopBackendFailed, stopBackendTimeout } from "./stop.js";
|
|
10
|
+
import { continueAfterParallelJoin, executeParallelWave, stopAfterParallelWave, } from "./wave.js";
|
|
10
11
|
export function runIteration(loop, iteration, iterate) {
|
|
11
12
|
const iter = buildIterationContext(loop, iteration);
|
|
12
13
|
printIterationBanner(loop, iter);
|
|
@@ -15,13 +16,21 @@ export function runIteration(loop, iteration, iterate) {
|
|
|
15
16
|
appendBackendStart(loop, iter);
|
|
16
17
|
log(loop, "debug", `backend start command=${loop.backend.command}`);
|
|
17
18
|
const startEpoch = Math.floor(Date.now() / 1000);
|
|
18
|
-
|
|
19
|
+
// Switch Kiro session agent mode per-role if agents.toml provides a mapping
|
|
20
|
+
if (iter.roleAgent && loop.backend.kind === "kiro" && loop.kiroSession) {
|
|
21
|
+
log(loop, "debug", `switching kiro agent to "${iter.roleAgent}" for role "${iter.allowedRoles[0]}"`);
|
|
22
|
+
setKiroSessionMode(loop.kiroSession, iter.roleAgent);
|
|
23
|
+
}
|
|
24
|
+
const { output, exitCode, timedOut } = loop.backend.kind === "kiro" && loop.kiroSession
|
|
25
|
+
? runKiroIterationSync(loop.kiroSession, iter.prompt, loop.backend.timeoutMs)
|
|
26
|
+
: runProcess(buildBackendCommand(loop, iter), loop.backend.timeoutMs, loop.backend.kind);
|
|
19
27
|
const elapsedS = Math.floor(Date.now() / 1000) - startEpoch;
|
|
20
28
|
appendBackendFinish(loop, iter, output, exitCode, timedOut);
|
|
21
29
|
appendIterationFinish(loop, iter, output, exitCode, timedOut, elapsedS);
|
|
22
30
|
registryProgress(loop, iteration);
|
|
23
31
|
log(loop, "debug", `iteration ${iteration} finish exit_code=${exitCode}`);
|
|
24
32
|
printIterationFooter(iter, elapsedS);
|
|
33
|
+
printBackendOutputTail(output);
|
|
25
34
|
if (timedOut)
|
|
26
35
|
return stopBackendTimeout(loop, iteration, output);
|
|
27
36
|
if (exitCode !== 0)
|
|
@@ -33,80 +42,68 @@ export function finishIteration(loop, iter, output, iterate) {
|
|
|
33
42
|
const allTopics = runLines.map(extractTopic).filter((t) => t !== "");
|
|
34
43
|
const turnLines = runLines.filter((l) => extractIteration(l) === String(iter.iteration));
|
|
35
44
|
const emitted = latestAgentEventRecord(turnLines);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
if (parallelTriggerTopic(emitted.topic)) {
|
|
40
|
-
return finishParallelIteration(loop, iter, emitted.topic, emitted.payload, iterate);
|
|
41
|
-
}
|
|
42
|
-
if (completedViaEvent(allTopics, loop.completion.event, loop.completion.requiredEvents)) {
|
|
43
|
-
printProgressLine({
|
|
44
|
-
runId: loop.runtime.runId,
|
|
45
|
-
iteration: iter.iteration,
|
|
46
|
-
recentEvent: iter.recentEvent,
|
|
47
|
-
allowedRoles: iter.allowedRoles,
|
|
48
|
-
emittedTopic: emitted.topic,
|
|
49
|
-
outcome: "complete:completion_event",
|
|
50
|
-
});
|
|
51
|
-
return completeLoop(loop, iter.iteration, "completion_event");
|
|
52
|
-
}
|
|
53
|
-
if (completedViaPromise(output, loop.completion.promise)) {
|
|
54
|
-
printProgressLine({
|
|
55
|
-
runId: loop.runtime.runId,
|
|
56
|
-
iteration: iter.iteration,
|
|
57
|
-
recentEvent: iter.recentEvent,
|
|
58
|
-
allowedRoles: iter.allowedRoles,
|
|
59
|
-
emittedTopic: emitted.topic,
|
|
60
|
-
outcome: "complete:completion_promise",
|
|
61
|
-
});
|
|
62
|
-
return completeLoop(loop, iter.iteration, "completion_promise");
|
|
63
|
-
}
|
|
64
|
-
printProgressLine({
|
|
45
|
+
const hadInvalidEvents = turnLines.some((l) => extractTopic(l) === "event.invalid");
|
|
46
|
+
const progress = (emittedTopic, outcome) => printProgressLine({
|
|
65
47
|
runId: loop.runtime.runId,
|
|
66
48
|
iteration: iter.iteration,
|
|
67
49
|
recentEvent: iter.recentEvent,
|
|
68
50
|
allowedRoles: iter.allowedRoles,
|
|
51
|
+
emittedTopic,
|
|
52
|
+
outcome,
|
|
53
|
+
});
|
|
54
|
+
if (invalidEvent(emitted.topic, iter.allowedEvents, loop.parallel.enabled, loop.completion.event)) {
|
|
55
|
+
return rejectInvalidAndContinue(loop, iter, emitted.topic, iterate, progress);
|
|
56
|
+
}
|
|
57
|
+
if (parallelTriggerTopic(emitted.topic)) {
|
|
58
|
+
return finishParallelIteration(loop, iter, emitted.topic, emitted.payload, iterate, progress);
|
|
59
|
+
}
|
|
60
|
+
const resolved = resolveOutcome({
|
|
69
61
|
emittedTopic: emitted.topic,
|
|
70
|
-
|
|
62
|
+
allTopics,
|
|
63
|
+
hadInvalidEvents,
|
|
64
|
+
output,
|
|
65
|
+
completionEvent: loop.completion.event,
|
|
66
|
+
requiredEvents: loop.completion.requiredEvents,
|
|
67
|
+
completionPromise: loop.completion.promise,
|
|
71
68
|
});
|
|
69
|
+
progress(emitted.topic, resolved.outcome);
|
|
70
|
+
if (resolved.action === "complete_event")
|
|
71
|
+
return completeLoop(loop, iter.iteration, "completion_event");
|
|
72
|
+
if (resolved.action === "complete_promise")
|
|
73
|
+
return completeLoop(loop, iter.iteration, "completion_promise");
|
|
72
74
|
return iterate(loop, iter.iteration + 1);
|
|
73
75
|
}
|
|
74
|
-
function rejectInvalidAndContinue(loop, iter, emittedTopic, iterate) {
|
|
76
|
+
function rejectInvalidAndContinue(loop, iter, emittedTopic, iterate, progress) {
|
|
75
77
|
appendInvalidEvent(loop.paths.journalFile, loop.runtime.runId, String(iter.iteration), iter.recentEvent, emittedTopic, iter.allowedRoles, iter.allowedEvents);
|
|
76
78
|
console.log(`[reject] invalid event \`${emittedTopic}\`; recent event: \`${iter.recentEvent}\`; allowed next events: ${listText(iter.allowedEvents)}`);
|
|
77
|
-
|
|
78
|
-
runId: loop.runtime.runId,
|
|
79
|
-
iteration: iter.iteration,
|
|
80
|
-
recentEvent: iter.recentEvent,
|
|
81
|
-
allowedRoles: iter.allowedRoles,
|
|
82
|
-
emittedTopic,
|
|
83
|
-
outcome: "rejected:event.invalid",
|
|
84
|
-
});
|
|
79
|
+
progress(emittedTopic, "rejected:event.invalid");
|
|
85
80
|
return iterate(loop, iter.iteration + 1);
|
|
86
81
|
}
|
|
87
|
-
function finishParallelIteration(loop, iter, emittedTopic, emittedPayload, iterate) {
|
|
82
|
+
function finishParallelIteration(loop, iter, emittedTopic, emittedPayload, iterate, progress) {
|
|
88
83
|
const result = executeParallelWave(loop, iter, emittedTopic, emittedPayload);
|
|
89
84
|
if (result.reason === "parallel_wave_complete") {
|
|
90
|
-
|
|
91
|
-
runId: loop.runtime.runId,
|
|
92
|
-
iteration: iter.iteration,
|
|
93
|
-
recentEvent: iter.recentEvent,
|
|
94
|
-
allowedRoles: iter.allowedRoles,
|
|
95
|
-
emittedTopic,
|
|
96
|
-
outcome: "parallel:joined",
|
|
97
|
-
});
|
|
85
|
+
progress(emittedTopic, "parallel:joined");
|
|
98
86
|
return continueAfterParallelJoin(loop, iter, result.waveId, emittedTopic, result.elapsedMs, iterate);
|
|
99
87
|
}
|
|
100
|
-
|
|
101
|
-
runId: loop.runtime.runId,
|
|
102
|
-
iteration: iter.iteration,
|
|
103
|
-
recentEvent: iter.recentEvent,
|
|
104
|
-
allowedRoles: iter.allowedRoles,
|
|
105
|
-
emittedTopic,
|
|
106
|
-
outcome: `parallel:stop:${result.reason}`,
|
|
107
|
-
});
|
|
88
|
+
progress(emittedTopic, `parallel:stop:${result.reason}`);
|
|
108
89
|
return stopAfterParallelWave(loop, iter, result.reason, result.waveId);
|
|
109
90
|
}
|
|
91
|
+
export function resolveOutcome(ctx) {
|
|
92
|
+
if (completedViaEvent(ctx.allTopics, ctx.completionEvent, ctx.requiredEvents)) {
|
|
93
|
+
return { action: "complete_event", outcome: "complete:completion_event" };
|
|
94
|
+
}
|
|
95
|
+
if (shouldContinueFromAcceptedEvent(ctx.emittedTopic, ctx.completionEvent)) {
|
|
96
|
+
return { action: "continue_routed", outcome: "continue:routed_event" };
|
|
97
|
+
}
|
|
98
|
+
if (!ctx.hadInvalidEvents &&
|
|
99
|
+
completedViaPromise(ctx.output, ctx.completionPromise)) {
|
|
100
|
+
return {
|
|
101
|
+
action: "complete_promise",
|
|
102
|
+
outcome: "complete:completion_promise",
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
return { action: "continue", outcome: "continue" };
|
|
106
|
+
}
|
|
110
107
|
function latestAgentEventRecord(lines) {
|
|
111
108
|
for (let i = lines.length - 1; i >= 0; i--) {
|
|
112
109
|
const topic = extractTopic(lines[i]);
|
|
@@ -126,4 +123,9 @@ function completedViaPromise(output, promise) {
|
|
|
126
123
|
return false;
|
|
127
124
|
return output.includes(promise);
|
|
128
125
|
}
|
|
126
|
+
function shouldContinueFromAcceptedEvent(emittedTopic, completionEvent) {
|
|
127
|
+
if (!emittedTopic)
|
|
128
|
+
return false;
|
|
129
|
+
return emittedTopic !== completionEvent;
|
|
130
|
+
}
|
|
129
131
|
//# sourceMappingURL=iteration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iteration.js","sourceRoot":"","sources":["../../src/harness/iteration.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"iteration.js","sourceRoot":"","sources":["../../src/harness/iteration.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,22 @@ export declare function extractRun(line: string): string;
|
|
|
9
9
|
export declare function extractIteration(line: string): string;
|
|
10
10
|
export declare function latestRunId(path: string): string;
|
|
11
11
|
export declare function latestIterationForRun(path: string, runId: string): string;
|
|
12
|
+
/**
|
|
13
|
+
* Merge journals from the top-level file, per-run journals under runs/,
|
|
14
|
+
* and worktree journals under worktrees/<id>/tree/<stateDirName>/.
|
|
15
|
+
* Returns all lines sorted by timestamp.
|
|
16
|
+
*/
|
|
17
|
+
export declare function readAllJournals(baseStateDir: string): string[];
|
|
18
|
+
/**
|
|
19
|
+
* Resolve the journal file path for a specific run within a state directory.
|
|
20
|
+
* Checks run-scoped (runs/<runId>/journal.jsonl) and worktree paths first.
|
|
21
|
+
* Returns null if no run-specific journal exists.
|
|
22
|
+
*/
|
|
23
|
+
export declare function resolveRunJournalPath(baseStateDir: string, runId: string): string | null;
|
|
24
|
+
/**
|
|
25
|
+
* Read journal lines for a specific run.
|
|
26
|
+
* Checks run-scoped and worktree paths via resolveRunJournalPath.
|
|
27
|
+
*/
|
|
28
|
+
export declare function readRunJournal(baseStateDir: string, runId: string): string[];
|
|
12
29
|
export declare function appendText(path: string, content: string): void;
|
|
13
30
|
export declare function readIfExists(path: string): string;
|
package/dist/harness/journal.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { existsSync,
|
|
2
|
-
import { dirname } from "node:path";
|
|
3
|
-
import { extractField as jsonExtractField, extractTopic as jsonExtractTopic } from "../json.js";
|
|
1
|
+
import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, } from "node:fs";
|
|
2
|
+
import { basename, dirname, join } from "node:path";
|
|
4
3
|
import { encodeEvent } from "../events/encode.js";
|
|
4
|
+
import { extractField as jsonExtractField, extractTopic as jsonExtractTopic, } from "../json.js";
|
|
5
5
|
import { lineSep } from "../utils.js";
|
|
6
6
|
export function appendEvent(path, runId, iteration, topic, fieldsJson) {
|
|
7
7
|
appendText(path, encodeEvent({
|
|
@@ -33,7 +33,7 @@ function parsedFields(fieldsJson) {
|
|
|
33
33
|
const parsed = parsedFieldsRaw(fieldsJson);
|
|
34
34
|
const result = {};
|
|
35
35
|
for (const [key, value] of Object.entries(parsed)) {
|
|
36
|
-
result[key] = value
|
|
36
|
+
result[key] = String(value ?? "");
|
|
37
37
|
}
|
|
38
38
|
return result;
|
|
39
39
|
}
|
|
@@ -41,7 +41,7 @@ function parsedFieldsRaw(fieldsJson) {
|
|
|
41
41
|
if (!fieldsJson.trim())
|
|
42
42
|
return {};
|
|
43
43
|
try {
|
|
44
|
-
return JSON.parse(
|
|
44
|
+
return JSON.parse(`{${fieldsJson}}`);
|
|
45
45
|
}
|
|
46
46
|
catch {
|
|
47
47
|
return {};
|
|
@@ -93,6 +93,75 @@ export function latestIterationForRun(path, runId) {
|
|
|
93
93
|
}
|
|
94
94
|
return current;
|
|
95
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* Merge journals from the top-level file, per-run journals under runs/,
|
|
98
|
+
* and worktree journals under worktrees/<id>/tree/<stateDirName>/.
|
|
99
|
+
* Returns all lines sorted by timestamp.
|
|
100
|
+
*/
|
|
101
|
+
export function readAllJournals(baseStateDir) {
|
|
102
|
+
const allLines = [];
|
|
103
|
+
// Top-level journal
|
|
104
|
+
const topLevel = join(baseStateDir, "journal.jsonl");
|
|
105
|
+
if (existsSync(topLevel))
|
|
106
|
+
allLines.push(...readLines(topLevel));
|
|
107
|
+
// Per-run journals under runs/*/journal.jsonl
|
|
108
|
+
const runsDir = join(baseStateDir, "runs");
|
|
109
|
+
if (existsSync(runsDir)) {
|
|
110
|
+
const entries = readdirSync(runsDir, { withFileTypes: true });
|
|
111
|
+
for (const entry of entries) {
|
|
112
|
+
if (!entry.isDirectory())
|
|
113
|
+
continue;
|
|
114
|
+
const runJournal = join(runsDir, entry.name, "journal.jsonl");
|
|
115
|
+
if (existsSync(runJournal))
|
|
116
|
+
allLines.push(...readLines(runJournal));
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// Worktree journals under worktrees/<id>/tree/<stateDirName>/journal.jsonl
|
|
120
|
+
const stateDirName = basename(baseStateDir);
|
|
121
|
+
const wtDir = join(baseStateDir, "worktrees");
|
|
122
|
+
if (existsSync(wtDir)) {
|
|
123
|
+
const entries = readdirSync(wtDir, { withFileTypes: true });
|
|
124
|
+
for (const entry of entries) {
|
|
125
|
+
if (!entry.isDirectory())
|
|
126
|
+
continue;
|
|
127
|
+
const wtJournal = join(wtDir, entry.name, "tree", stateDirName, "journal.jsonl");
|
|
128
|
+
if (existsSync(wtJournal))
|
|
129
|
+
allLines.push(...readLines(wtJournal));
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
// Sort by timestamp field if present
|
|
133
|
+
return allLines.sort((a, b) => {
|
|
134
|
+
const tsA = extractTimestamp(a);
|
|
135
|
+
const tsB = extractTimestamp(b);
|
|
136
|
+
return tsA.localeCompare(tsB);
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Resolve the journal file path for a specific run within a state directory.
|
|
141
|
+
* Checks run-scoped (runs/<runId>/journal.jsonl) and worktree paths first.
|
|
142
|
+
* Returns null if no run-specific journal exists.
|
|
143
|
+
*/
|
|
144
|
+
export function resolveRunJournalPath(baseStateDir, runId) {
|
|
145
|
+
const runJournal = join(baseStateDir, "runs", runId, "journal.jsonl");
|
|
146
|
+
if (existsSync(runJournal))
|
|
147
|
+
return runJournal;
|
|
148
|
+
const stateDirName = basename(baseStateDir);
|
|
149
|
+
const wtJournal = join(baseStateDir, "worktrees", runId, "tree", stateDirName, "journal.jsonl");
|
|
150
|
+
if (existsSync(wtJournal))
|
|
151
|
+
return wtJournal;
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Read journal lines for a specific run.
|
|
156
|
+
* Checks run-scoped and worktree paths via resolveRunJournalPath.
|
|
157
|
+
*/
|
|
158
|
+
export function readRunJournal(baseStateDir, runId) {
|
|
159
|
+
const path = resolveRunJournalPath(baseStateDir, runId);
|
|
160
|
+
return path ? readLines(path) : [];
|
|
161
|
+
}
|
|
162
|
+
function extractTimestamp(line) {
|
|
163
|
+
return extractField(line, "timestamp") || extractField(line, "ts") || "";
|
|
164
|
+
}
|
|
96
165
|
export function appendText(path, content) {
|
|
97
166
|
const dir = dirname(path);
|
|
98
167
|
mkdirSync(dir, { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/harness/journal.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/harness/journal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,48 @@
|
|
|
1
|
-
import { jsonField, jsonFieldRaw
|
|
2
|
-
import {
|
|
3
|
-
import { renderReviewPromptText } from "./prompt.js";
|
|
1
|
+
import { jsonBool, jsonField, jsonFieldRaw } from "../json.js";
|
|
2
|
+
import { reloadLoop } from "./config-helpers.js";
|
|
4
3
|
import { printReviewBanner } from "./display.js";
|
|
4
|
+
import { appendEvent, readRunLines } from "./journal.js";
|
|
5
5
|
import { buildReviewCommand, runProcess } from "./parallel.js";
|
|
6
|
-
import {
|
|
6
|
+
import { renderReviewPromptText } from "./prompt.js";
|
|
7
|
+
import { runKiroIterationSync } from "../backend/kiro-bridge.js";
|
|
7
8
|
export function maybeRunMetareview(loop, iteration) {
|
|
8
9
|
if (shouldRunMetareview(loop, iteration)) {
|
|
9
10
|
runMetareviewReview(loop, iteration);
|
|
10
|
-
|
|
11
|
+
const reloaded = reloadLoop(loop);
|
|
12
|
+
reloaded.kiroSession = loop.kiroSession;
|
|
13
|
+
return reloaded;
|
|
11
14
|
}
|
|
12
15
|
return loop;
|
|
13
16
|
}
|
|
14
17
|
export function shouldRunMetareview(loop, iteration) {
|
|
15
|
-
return loop.review.enabled &&
|
|
18
|
+
return (loop.review.enabled &&
|
|
19
|
+
iteration > 1 &&
|
|
20
|
+
(iteration - 1) % loop.review.every === 0);
|
|
16
21
|
}
|
|
17
22
|
export function runMetareviewReview(loop, iteration) {
|
|
18
23
|
printReviewBanner(iteration);
|
|
19
24
|
const runLines = readRunLines(loop.paths.journalFile, loop.runtime.runId);
|
|
20
25
|
const reviewPrompt = renderReviewPromptText(loop, iteration, runLines);
|
|
21
26
|
appendEvent(loop.paths.journalFile, loop.runtime.runId, String(iteration), "review.start", jsonField("kind", "metareview") +
|
|
22
|
-
", " +
|
|
23
|
-
|
|
24
|
-
", " +
|
|
25
|
-
|
|
26
|
-
", " +
|
|
27
|
-
|
|
27
|
+
", " +
|
|
28
|
+
jsonField("backend_kind", loop.review.kind) +
|
|
29
|
+
", " +
|
|
30
|
+
jsonField("command", loop.review.command) +
|
|
31
|
+
", " +
|
|
32
|
+
jsonField("prompt_mode", loop.review.promptMode) +
|
|
33
|
+
", " +
|
|
34
|
+
jsonField("prompt", reviewPrompt) +
|
|
35
|
+
", " +
|
|
36
|
+
jsonField("timeout_ms", String(loop.review.timeoutMs)));
|
|
37
|
+
const { output, exitCode, timedOut } = loop.review.kind === "kiro" && loop.kiroSession
|
|
38
|
+
? runKiroIterationSync(loop.kiroSession, reviewPrompt, loop.review.timeoutMs)
|
|
39
|
+
: runProcess(buildReviewCommand(loop, iteration, reviewPrompt), loop.review.timeoutMs, loop.review.kind);
|
|
28
40
|
appendEvent(loop.paths.journalFile, loop.runtime.runId, String(iteration), "review.finish", jsonField("kind", "metareview") +
|
|
29
|
-
", " +
|
|
30
|
-
|
|
31
|
-
", " +
|
|
41
|
+
", " +
|
|
42
|
+
jsonField("exit_code", String(exitCode)) +
|
|
43
|
+
", " +
|
|
44
|
+
jsonFieldRaw("timed_out", jsonBool(timedOut)) +
|
|
45
|
+
", " +
|
|
46
|
+
jsonField("output", output));
|
|
32
47
|
}
|
|
33
48
|
//# sourceMappingURL=metareview.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metareview.js","sourceRoot":"","sources":["../../src/harness/metareview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"metareview.js","sourceRoot":"","sources":["../../src/harness/metareview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAU,kBAAkB,CAChC,IAAiB,EACjB,SAAiB;IAEjB,IAAI,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;QACzC,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAiB,EACjB,SAAiB;IAEjB,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,OAAO;QACnB,SAAS,GAAG,CAAC;QACb,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAiB,EACjB,SAAiB;IAEjB,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAEvE,WAAW,CACT,IAAI,CAAC,KAAK,CAAC,WAAW,EACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,MAAM,CAAC,SAAS,CAAC,EACjB,cAAc,EACd,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC;QAC7B,IAAI;QACJ,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC3C,IAAI;QACJ,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QACzC,IAAI;QACJ,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAChD,IAAI;QACJ,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;QACjC,IAAI;QACJ,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CACzD,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW;QACpF,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAC7E,CAAC,CAAC,UAAU,CACR,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,CAAC,EACjD,IAAI,CAAC,MAAM,CAAC,SAAS,EACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC;IAEN,WAAW,CACT,IAAI,CAAC,KAAK,CAAC,WAAW,EACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,MAAM,CAAC,SAAS,CAAC,EACjB,eAAe,EACf,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC;QAC7B,IAAI;QACJ,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI;QACJ,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI;QACJ,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAC9B,CAAC;AACJ,CAAC"}
|
package/dist/harness/metrics.js
CHANGED
|
@@ -9,7 +9,7 @@ export function collectMetricsRows(lines) {
|
|
|
9
9
|
if (!event)
|
|
10
10
|
continue;
|
|
11
11
|
if (event.topic === "iteration.start" && event.shape === "fields") {
|
|
12
|
-
const roles = event.fields
|
|
12
|
+
const roles = event.fields.suggested_roles ?? "";
|
|
13
13
|
const role = firstCsvValue(roles);
|
|
14
14
|
rows.push({
|
|
15
15
|
iteration: event.iteration ?? "",
|
|
@@ -26,9 +26,9 @@ export function collectMetricsRows(lines) {
|
|
|
26
26
|
const iter = event.iteration ?? "";
|
|
27
27
|
for (let i = rows.length - 1; i >= 0; i--) {
|
|
28
28
|
if (rows[i].iteration === iter) {
|
|
29
|
-
rows[i].exitCode = event.fields
|
|
30
|
-
rows[i].timedOut = event.fields
|
|
31
|
-
rows[i].elapsedS = event.fields
|
|
29
|
+
rows[i].exitCode = event.fields.exit_code ?? "";
|
|
30
|
+
rows[i].timedOut = event.fields.timed_out ?? "";
|
|
31
|
+
rows[i].elapsedS = event.fields.elapsed_s ?? "";
|
|
32
32
|
rows[i].outcome = computeOutcome(rows[i].exitCode, rows[i].timedOut, rows[i].event);
|
|
33
33
|
break;
|
|
34
34
|
}
|
|
@@ -78,7 +78,7 @@ function formatMetricsMd(rows) {
|
|
|
78
78
|
r.timedOut,
|
|
79
79
|
r.outcome,
|
|
80
80
|
]);
|
|
81
|
-
return table(headers, tableRows)
|
|
81
|
+
return `${table(headers, tableRows)}\n\n${metricsSummary(rows)}`;
|
|
82
82
|
}
|
|
83
83
|
function metricsSummary(rows) {
|
|
84
84
|
const total = rows.length;
|
|
@@ -97,7 +97,7 @@ function sumElapsed(rows) {
|
|
|
97
97
|
for (const row of rows) {
|
|
98
98
|
if (row.elapsedS) {
|
|
99
99
|
const val = parseFloat(row.elapsedS);
|
|
100
|
-
if (!isNaN(val))
|
|
100
|
+
if (!Number.isNaN(val))
|
|
101
101
|
sum += val;
|
|
102
102
|
}
|
|
103
103
|
}
|
|
@@ -128,11 +128,11 @@ function formatMetricsCsv(rows) {
|
|
|
128
128
|
csvQuote(r.timedOut) +
|
|
129
129
|
"," +
|
|
130
130
|
csvQuote(r.outcome));
|
|
131
|
-
return header
|
|
131
|
+
return `${header}\n${csvRows.join("\n")}`;
|
|
132
132
|
}
|
|
133
133
|
function csvQuote(value) {
|
|
134
134
|
if (value.includes(",") || value.includes('"') || value.includes("\n")) {
|
|
135
|
-
return
|
|
135
|
+
return `"${value.replace(/"/g, '""')}"`;
|
|
136
136
|
}
|
|
137
137
|
return value;
|
|
138
138
|
}
|
|
@@ -154,15 +154,15 @@ function formatMetricsJson(rows) {
|
|
|
154
154
|
", " +
|
|
155
155
|
jsonField("outcome", r.outcome) +
|
|
156
156
|
"}");
|
|
157
|
-
return
|
|
157
|
+
return `[${items.join(", ")}]`;
|
|
158
158
|
}
|
|
159
159
|
function jsonNumberOrNull(key, value) {
|
|
160
160
|
if (!value)
|
|
161
|
-
return
|
|
162
|
-
return
|
|
161
|
+
return `"${key}": null`;
|
|
162
|
+
return `"${key}": ${value}`;
|
|
163
163
|
}
|
|
164
164
|
function jsonBoolField(key, value) {
|
|
165
|
-
return
|
|
165
|
+
return `"${key}": ${value === "true" ? "true" : "false"}`;
|
|
166
166
|
}
|
|
167
167
|
function computeOutcome(exitCode, timedOut, event) {
|
|
168
168
|
if (timedOut === "true")
|