gaunt-sloth 2.0.0-beta.12 → 2.0.0-beta.13
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/cli.js +49 -0
- package/dist/commands/adkEvalRunner.d.ts +7 -6
- package/dist/commands/adkEvalRunner.js +3 -3
- package/dist/commands/adkEvalRunner.js.map +1 -1
- package/dist/commands/agUiEvalRunner.d.ts +4 -4
- package/dist/commands/agUiEvalRunner.js +8 -7
- package/dist/commands/agUiEvalRunner.js.map +1 -1
- package/dist/commands/askCommand.js +9 -1
- package/dist/commands/askCommand.js.map +1 -1
- package/dist/commands/batchCommand.d.ts +2 -2
- package/dist/commands/batchCommand.js +2 -2
- package/dist/commands/configCommand.d.ts +1 -1
- package/dist/commands/configCommand.js +1 -1
- package/dist/commands/configSetup.d.ts +1 -1
- package/dist/commands/evalCommand.d.ts +1 -1
- package/dist/commands/evalCommand.js +8 -3
- package/dist/commands/evalCommand.js.map +1 -1
- package/dist/commands/execCommand.d.ts +1 -1
- package/dist/commands/execCommand.js +9 -2
- package/dist/commands/execCommand.js.map +1 -1
- package/dist/commands/firstRunDialog.d.ts +3 -3
- package/dist/commands/firstRunDialog.js +2 -2
- package/dist/commands/historyCommand.d.ts +1 -1
- package/dist/commands/historyCommand.js +16 -4
- package/dist/commands/historyCommand.js.map +1 -1
- package/dist/commands/prDiscovery.d.ts +1 -1
- package/dist/tui/components/App.js +249 -24
- package/dist/tui/components/App.js.map +1 -1
- package/dist/tui/components/DebugPanel.d.ts +6 -3
- package/dist/tui/components/DebugPanel.js +15 -3
- package/dist/tui/components/DebugPanel.js.map +1 -1
- package/dist/tui/components/FetchProgress.d.ts +1 -1
- package/dist/tui/components/LaunchBanner.d.ts +1 -1
- package/dist/tui/components/LaunchBanner.js +1 -1
- package/dist/tui/components/LiveTurn.d.ts +6 -5
- package/dist/tui/components/LiveTurn.js +15 -14
- package/dist/tui/components/LiveTurn.js.map +1 -1
- package/dist/tui/components/PromptInput.d.ts +2 -2
- package/dist/tui/components/PromptInput.js +11 -6
- package/dist/tui/components/PromptInput.js.map +1 -1
- package/dist/tui/components/ResumePicker.d.ts +69 -0
- package/dist/tui/components/ResumePicker.js +93 -0
- package/dist/tui/components/ResumePicker.js.map +1 -0
- package/dist/tui/components/SelectList.d.ts +1 -1
- package/dist/tui/components/SelectList.js +1 -1
- package/dist/tui/components/SlashCommandMenu.d.ts +1 -1
- package/dist/tui/components/SlashCommandMenu.js +1 -1
- package/dist/tui/components/StatusBar.d.ts +27 -1
- package/dist/tui/components/StatusBar.js +13 -2
- package/dist/tui/components/StatusBar.js.map +1 -1
- package/dist/tui/debugRender.d.ts +26 -3
- package/dist/tui/debugRender.js +220 -2
- package/dist/tui/debugRender.js.map +1 -1
- package/dist/tui/fixtureAgent.d.ts +2 -2
- package/dist/tui/fixtureAgent.js +2 -2
- package/dist/tui/keyGuards.d.ts +1 -1
- package/dist/tui/keyGuards.js +1 -1
- package/dist/tui/ruleWidth.d.ts +1 -1
- package/dist/tui/ruleWidth.js +1 -1
- package/dist/tui/selectCancelled.d.ts +1 -1
- package/dist/tui/selectCancelled.js +1 -1
- package/dist/tui/transcriptWindow.js +7 -1
- package/dist/tui/transcriptWindow.js.map +1 -1
- package/dist/tui/tuiSessionModule.js +17 -1
- package/dist/tui/tuiSessionModule.js.map +1 -1
- package/dist/tui/types.d.ts +45 -7
- package/dist/tui/useMouse.d.ts +1 -1
- package/dist/tui/useMouse.js +1 -1
- package/dist/tui/useSlothAnimation.d.ts +1 -1
- package/dist/tui/viewModel.d.ts +64 -12
- package/dist/tui/viewModel.js +38 -11
- package/dist/tui/viewModel.js.map +1 -1
- package/dist/utils/configErrorGuard.d.ts +11 -3
- package/dist/utils/configErrorGuard.js +11 -3
- package/dist/utils/configErrorGuard.js.map +1 -1
- package/package.json +5 -5
package/cli.js
CHANGED
|
@@ -34,6 +34,55 @@ if (process.argv.includes('--acp-agent')) {
|
|
|
34
34
|
process.exit(1);
|
|
35
35
|
}
|
|
36
36
|
} else {
|
|
37
|
+
// --- React build selection (TUI-C55) ------------------------------------
|
|
38
|
+
// React chooses its build ONCE, the first time `react/index.js` is evaluated:
|
|
39
|
+
//
|
|
40
|
+
// if (process.env.NODE_ENV === 'production') require('./cjs/react.production.js');
|
|
41
|
+
// else require('./cjs/react.development.js');
|
|
42
|
+
//
|
|
43
|
+
// Nothing re-reads NODE_ENV afterwards. So an assignment that runs even one
|
|
44
|
+
// import too late is SILENTLY INERT: the CLI still works, every test still
|
|
45
|
+
// passes, and every Ink render still pays for the development reconciler's
|
|
46
|
+
// prop/hook bookkeeping and warning machinery. There is no error to notice.
|
|
47
|
+
//
|
|
48
|
+
// WHY IT SITS EXACTLY HERE, and what breaks if you move it:
|
|
49
|
+
//
|
|
50
|
+
// * It must run before React is first evaluated. This file has NO static
|
|
51
|
+
// imports — both branches use dynamic `await import(...)` — and ESM hoists
|
|
52
|
+
// static `import` declarations and evaluates them before any body
|
|
53
|
+
// statement. So a single static import added anywhere in this file could be
|
|
54
|
+
// evaluated ahead of this line and freeze React on the development build.
|
|
55
|
+
// Keep this file import-free. For the same reason this must not be "tidied"
|
|
56
|
+
// into a helper module imported from here: the import would be evaluated
|
|
57
|
+
// first, and the assignment would then be decorative.
|
|
58
|
+
//
|
|
59
|
+
// * It must NOT run before the `--acp-agent` branch above. That branch is
|
|
60
|
+
// documented to start ACP through the same path as the standalone
|
|
61
|
+
// `gaunt-sloth-acp` bin so the two doors cannot behave differently, and
|
|
62
|
+
// that bin sets no NODE_ENV. Hoisting this to the top of the file would
|
|
63
|
+
// make the two doors diverge. React is only ever loaded down this branch
|
|
64
|
+
// (it lives in packages/app/src/tui/**), so this is both the earliest
|
|
65
|
+
// correct place and the latest safe one.
|
|
66
|
+
//
|
|
67
|
+
// Guarded, not unconditional: a developer running from source, a `NODE_ENV=test`
|
|
68
|
+
// vitest run, or an operator with their own value keeps it (overriding this is
|
|
69
|
+
// supported and is what `react-build.tui.test.ts` uses as its live control).
|
|
70
|
+
//
|
|
71
|
+
// GTH_SYNTHESIZED_NODE_ENV records that WE invented the value. A user's own
|
|
72
|
+
// `production` is byte-identical to ours, so without this marker the child-env
|
|
73
|
+
// builder could not tell "drop it, we made it up" from "keep it, the operator
|
|
74
|
+
// set it". It travels by environment rather than by module state because it has
|
|
75
|
+
// to cross into packages/agent, which this file cannot import from.
|
|
76
|
+
// See packages/agent/src/tools/shell/env.ts (buildScrubbedEnv).
|
|
77
|
+
//
|
|
78
|
+
// Proof this still works: packages/app/tui-e2e/react-build.tui.test.ts asserts a
|
|
79
|
+
// real PTY run of THIS entry point loads react.production.js, and its sibling
|
|
80
|
+
// case asserts an explicit NODE_ENV still wins.
|
|
81
|
+
if (!process.env.NODE_ENV) {
|
|
82
|
+
process.env.NODE_ENV = 'production';
|
|
83
|
+
process.env.GTH_SYNTHESIZED_NODE_ENV = '1';
|
|
84
|
+
}
|
|
85
|
+
|
|
37
86
|
// This is a minimalistic entry point that sets the installDir in systemUtils
|
|
38
87
|
// and delegates to the compiled TypeScript code in dist/cli.js.
|
|
39
88
|
// systemUtils lives in @gaunt-sloth/core (the app-side re-export shim died in
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @module adkEvalRunner
|
|
3
2
|
* BATCH-14 — the ADK (A2A) target's production runner builders for `gth eval`. The eval runner
|
|
4
|
-
* ({@link @gaunt-sloth/batch
|
|
5
|
-
*
|
|
3
|
+
* ({@link @gaunt-sloth/batch!"evalRunner.js".runEvalSuite | runEvalSuite}) is target-agnostic: it consumes an injected
|
|
4
|
+
* `RunCellFn` (single-shot) and `RunConversationFn` (multi-turn) and grades whatever
|
|
6
5
|
* `answer` they produce with the SAME assertion surface used for the `gth-agent` target. This module
|
|
7
6
|
* builds those two functions for an EXTERNAL Google ADK agent, driving it over the A2A protocol via
|
|
8
7
|
* {@link A2AClientWrapper} (the existing `@a2a-js/sdk` wrapper) — the analogue of `batchCommand.ts`'s
|
|
@@ -17,6 +16,8 @@
|
|
|
17
16
|
* never populate `tools`, and `must_call`/`must_not_call` are rejected at suite-parse time rather
|
|
18
17
|
* than silently passed. A2A likewise carries no token accounting, so `tokensInput`/`tokensOutput`
|
|
19
18
|
* are left unset (undefined), unlike the gth-agent path.
|
|
19
|
+
*
|
|
20
|
+
* @module
|
|
20
21
|
*/
|
|
21
22
|
import type { AdkAgentTarget, RunCellFn, RunConversationFn } from '@gaunt-sloth/batch';
|
|
22
23
|
/** One A2A turn's result as the ADK runner needs it: the answer text plus the continuity handles to
|
|
@@ -44,7 +45,7 @@ export type AdkClientFactory = (target: AdkAgentTarget) => AdkA2AClient;
|
|
|
44
45
|
* narrow {@link AdkA2AClient} shape via its context-threading {@link A2AClientWrapper.sendMessageWithContext}. */
|
|
45
46
|
export declare const defaultAdkClientFactory: AdkClientFactory;
|
|
46
47
|
/**
|
|
47
|
-
* Build the injectable single-shot
|
|
48
|
+
* Build the injectable single-shot `RunCellFn` that drives ONE ADK agent turn over A2A: send
|
|
48
49
|
* the cell's prompt as the A2A message text and return the agent's text as the cell `answer`. A
|
|
49
50
|
* transport/agent error is contained as a failed cell (`ok:false`) so one bad case can never take the
|
|
50
51
|
* whole suite down — matching `buildProductionRunCell`'s discipline for the gth-agent path.
|
|
@@ -53,13 +54,13 @@ export declare const defaultAdkClientFactory: AdkClientFactory;
|
|
|
53
54
|
*/
|
|
54
55
|
export declare function buildAdkRunCell(target: AdkAgentTarget, createClient?: AdkClientFactory): RunCellFn;
|
|
55
56
|
/**
|
|
56
|
-
* Build the injectable multi-turn
|
|
57
|
+
* Build the injectable multi-turn `RunConversationFn` that drives a whole scripted conversation
|
|
57
58
|
* against the ADK agent over A2A, threading the A2A `contextId` across turns so turn N sees turn
|
|
58
59
|
* N-1's context (an ADK agent keeps conversational memory by `contextId`). ONE client is built for
|
|
59
60
|
* the conversation; the first turn sends no context, and each subsequent turn carries the `contextId`
|
|
60
61
|
* the previous response returned.
|
|
61
62
|
*
|
|
62
|
-
* Returns one
|
|
63
|
+
* Returns one `TurnRunOutcome` per turn attempted. A turn that throws is recorded as a failed
|
|
63
64
|
* turn and ABORTS the conversation (the returned array is short) — the runner fails the un-run turns
|
|
64
65
|
* with a clear reason, exactly as it does for a gth-agent conversation that ended early.
|
|
65
66
|
*/
|
|
@@ -11,7 +11,7 @@ export const defaultAdkClientFactory = (target) => {
|
|
|
11
11
|
};
|
|
12
12
|
};
|
|
13
13
|
/**
|
|
14
|
-
* Build the injectable single-shot
|
|
14
|
+
* Build the injectable single-shot `RunCellFn` that drives ONE ADK agent turn over A2A: send
|
|
15
15
|
* the cell's prompt as the A2A message text and return the agent's text as the cell `answer`. A
|
|
16
16
|
* transport/agent error is contained as a failed cell (`ok:false`) so one bad case can never take the
|
|
17
17
|
* whole suite down — matching `buildProductionRunCell`'s discipline for the gth-agent path.
|
|
@@ -31,13 +31,13 @@ export function buildAdkRunCell(target, createClient = defaultAdkClientFactory)
|
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
34
|
-
* Build the injectable multi-turn
|
|
34
|
+
* Build the injectable multi-turn `RunConversationFn` that drives a whole scripted conversation
|
|
35
35
|
* against the ADK agent over A2A, threading the A2A `contextId` across turns so turn N sees turn
|
|
36
36
|
* N-1's context (an ADK agent keeps conversational memory by `contextId`). ONE client is built for
|
|
37
37
|
* the conversation; the first turn sends no context, and each subsequent turn carries the `contextId`
|
|
38
38
|
* the previous response returned.
|
|
39
39
|
*
|
|
40
|
-
* Returns one
|
|
40
|
+
* Returns one `TurnRunOutcome` per turn attempted. A turn that throws is recorded as a failed
|
|
41
41
|
* turn and ABORTS the conversation (the returned array is short) — the runner fails the un-run turns
|
|
42
42
|
* with a clear reason, exactly as it does for a gth-agent conversation that ended early.
|
|
43
43
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adkEvalRunner.js","sourceRoot":"","sources":["../../src/commands/adkEvalRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adkEvalRunner.js","sourceRoot":"","sources":["../../src/commands/adkEvalRunner.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AA0BtF;kHACkH;AAClH,MAAM,CAAC,MAAM,uBAAuB,GAAqB,CAAC,MAAM,EAAE,EAAE;IAClE,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC;QACnC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,WAAW;QACtC,QAAQ,EAAE,MAAM,CAAC,GAAG;KACrB,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC;KAC9E,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAsB,EACtB,YAAY,GAAqB,uBAAuB;IAExD,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAAsB,EACtB,YAAY,GAAqB,uBAAuB;IAExD,OAAO,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAqB,EAAE,CAAC;QACtC,IAAI,SAA6B,CAAC;QAElC,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBAC1F,yFAAyF;gBACzF,IAAI,QAAQ,CAAC,SAAS;oBAAE,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;gBACvD,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,QAAQ,CAAC,IAAI,CAAC;oBACZ,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC9D,CAAC,CAAC;gBACH,uFAAuF;gBACvF,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -46,7 +46,7 @@ export declare const AG_UI_RUN_TIMEOUT_MS = 120000;
|
|
|
46
46
|
/**
|
|
47
47
|
* Create a real {@link AgUiClient} that drives the target's AG-UI run endpoint over HTTP/SSE. Each
|
|
48
48
|
* `run` POSTs a `RunAgentInput` to `{url}/agents/{agentId}/run` and decodes the SSE response via
|
|
49
|
-
*
|
|
49
|
+
* `decodeAgUiStream`. A non-2xx response, an absent body, a `RUN_ERROR` event, a truncated
|
|
50
50
|
* stream, or a run that exceeds `timeoutMs` all throw — the runner builders contain that into a
|
|
51
51
|
* failed cell (`ok:false`).
|
|
52
52
|
*
|
|
@@ -65,7 +65,7 @@ export declare function createAgUiClient(target: AgUiAgentTarget, fetchImpl?: Fe
|
|
|
65
65
|
/** Production factory: a real HTTP/SSE {@link AgUiClient} over the target's AG-UI endpoint. */
|
|
66
66
|
export declare const defaultAgUiClientFactory: AgUiClientFactory;
|
|
67
67
|
/**
|
|
68
|
-
* Build the injectable single-shot
|
|
68
|
+
* Build the injectable single-shot `RunCellFn` that drives ONE AG-UI run: send the cell's
|
|
69
69
|
* prompt as the sole `user` message (fresh `threadId`/`runId`) and return the agent's assembled text
|
|
70
70
|
* as the cell `answer` plus the tool names captured from the stream as `tools`. A transport/stream
|
|
71
71
|
* error is contained as a failed cell (`ok:false`) so one bad case can never take the whole suite
|
|
@@ -76,13 +76,13 @@ export declare const defaultAgUiClientFactory: AgUiClientFactory;
|
|
|
76
76
|
*/
|
|
77
77
|
export declare function buildAgUiRunCell(target: AgUiAgentTarget, createClient?: AgUiClientFactory): RunCellFn;
|
|
78
78
|
/**
|
|
79
|
-
* Build the injectable multi-turn
|
|
79
|
+
* Build the injectable multi-turn `RunConversationFn` that drives a whole scripted conversation
|
|
80
80
|
* against the AG-UI agent, threading continuity via the `messages` array + a STABLE `threadId` across
|
|
81
81
|
* the turns of ONE conversation: each turn appends its `user` message, POSTs the accumulated history
|
|
82
82
|
* under the same `threadId`, then appends the assistant's answer so the next turn's request carries
|
|
83
83
|
* it. ONE `threadId` for the whole conversation; a fresh `runId` per turn.
|
|
84
84
|
*
|
|
85
|
-
* Returns one
|
|
85
|
+
* Returns one `TurnRunOutcome` per turn attempted (answer + per-turn tool trace). A turn that
|
|
86
86
|
* throws is recorded as a failed turn and ABORTS the conversation (the returned array is short) — the
|
|
87
87
|
* runner fails the un-run turns with a clear reason, exactly as it does for a gth-agent conversation
|
|
88
88
|
* that ended early.
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @module agUiEvalRunner
|
|
3
2
|
* BATCH-15 — the AG-UI target's production runner builders for `gth eval`. The eval runner
|
|
4
|
-
* ({@link @gaunt-sloth/batch
|
|
5
|
-
*
|
|
3
|
+
* ({@link @gaunt-sloth/batch!"evalRunner.js".runEvalSuite | runEvalSuite}) is target-agnostic: it consumes an injected
|
|
4
|
+
* `RunCellFn` (single-shot) and `RunConversationFn` (multi-turn) and grades whatever
|
|
6
5
|
* `answer` (and `tools`) they produce with the SAME assertion surface used for the `gth-agent`
|
|
7
6
|
* target. This module builds those two functions for an EXTERNAL agent exposed over the AG-UI
|
|
8
7
|
* protocol, driving its HTTP/SSE run endpoint — the analogue of `batchCommand.ts`'s
|
|
@@ -27,6 +26,8 @@
|
|
|
27
26
|
* `answer`, `TOOL_CALL_START` names into `tools`, and treat `RUN_ERROR` (or a non-200, or a stream
|
|
28
27
|
* that ends without the terminal `RUN_FINISHED`) as a failed run — a gradeable `ok:false`, never
|
|
29
28
|
* an uncaught throw that aborts the whole suite.
|
|
29
|
+
*
|
|
30
|
+
* @module
|
|
30
31
|
*/
|
|
31
32
|
import { randomUUID } from 'node:crypto';
|
|
32
33
|
import { EventType } from '@ag-ui/core';
|
|
@@ -158,7 +159,7 @@ async function releaseBody(body) {
|
|
|
158
159
|
/**
|
|
159
160
|
* Create a real {@link AgUiClient} that drives the target's AG-UI run endpoint over HTTP/SSE. Each
|
|
160
161
|
* `run` POSTs a `RunAgentInput` to `{url}/agents/{agentId}/run` and decodes the SSE response via
|
|
161
|
-
*
|
|
162
|
+
* `decodeAgUiStream`. A non-2xx response, an absent body, a `RUN_ERROR` event, a truncated
|
|
162
163
|
* stream, or a run that exceeds `timeoutMs` all throw — the runner builders contain that into a
|
|
163
164
|
* failed cell (`ok:false`).
|
|
164
165
|
*
|
|
@@ -246,7 +247,7 @@ export function createAgUiClient(target, fetchImpl = fetch, timeoutMs = AG_UI_RU
|
|
|
246
247
|
/** Production factory: a real HTTP/SSE {@link AgUiClient} over the target's AG-UI endpoint. */
|
|
247
248
|
export const defaultAgUiClientFactory = (target) => createAgUiClient(target);
|
|
248
249
|
/**
|
|
249
|
-
* Build the injectable single-shot
|
|
250
|
+
* Build the injectable single-shot `RunCellFn` that drives ONE AG-UI run: send the cell's
|
|
250
251
|
* prompt as the sole `user` message (fresh `threadId`/`runId`) and return the agent's assembled text
|
|
251
252
|
* as the cell `answer` plus the tool names captured from the stream as `tools`. A transport/stream
|
|
252
253
|
* error is contained as a failed cell (`ok:false`) so one bad case can never take the whole suite
|
|
@@ -272,13 +273,13 @@ export function buildAgUiRunCell(target, createClient = defaultAgUiClientFactory
|
|
|
272
273
|
};
|
|
273
274
|
}
|
|
274
275
|
/**
|
|
275
|
-
* Build the injectable multi-turn
|
|
276
|
+
* Build the injectable multi-turn `RunConversationFn` that drives a whole scripted conversation
|
|
276
277
|
* against the AG-UI agent, threading continuity via the `messages` array + a STABLE `threadId` across
|
|
277
278
|
* the turns of ONE conversation: each turn appends its `user` message, POSTs the accumulated history
|
|
278
279
|
* under the same `threadId`, then appends the assistant's answer so the next turn's request carries
|
|
279
280
|
* it. ONE `threadId` for the whole conversation; a fresh `runId` per turn.
|
|
280
281
|
*
|
|
281
|
-
* Returns one
|
|
282
|
+
* Returns one `TurnRunOutcome` per turn attempted (answer + per-turn tool trace). A turn that
|
|
282
283
|
* throws is recorded as a failed turn and ABORTS the conversation (the returned array is short) — the
|
|
283
284
|
* runner fails the un-run turns with a clear reason, exactly as it does for a gth-agent conversation
|
|
284
285
|
* that ended early.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agUiEvalRunner.js","sourceRoot":"","sources":["../../src/commands/agUiEvalRunner.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"agUiEvalRunner.js","sourceRoot":"","sources":["../../src/commands/agUiEvalRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAkDxC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,KAAK,UAAU,gBAAgB,CAAC,IAAgC;IAC9D,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,gGAAgG;IAChG,qEAAqE;IACrE,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,gBAAoC,CAAC;IACzC,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,QAA4B,CAAC;IACjC,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;QAC1C,MAAM,OAAO,GAAG,KAAK;aAClB,KAAK,CAAC,OAAO,CAAC;aACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;aAC1C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;aAChD,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,KAMH,CAAC;QACF,IAAI,CAAC;YACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,sDAAsD;YACtD,OAAO;QACT,CAAC;QACD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,SAAS,CAAC,oBAAoB;gBACjC,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACpC,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpF,sFAAsF;oBACtF,iFAAiF;oBACjF,IAAI,CAAC,aAAa,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;wBACrD,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBACrB,gBAAgB,GAAG,SAAS,CAAC;wBAC7B,aAAa,GAAG,IAAI,CAAC;oBACvB,CAAC;oBACD,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC;gBACrD,CAAC;gBACD,MAAM;YACR,KAAK,SAAS,CAAC,eAAe;gBAC5B,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ;oBAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC3E,MAAM;YACR,KAAK,SAAS,CAAC,SAAS;gBACtB,QAAQ,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC;gBACnF,MAAM;YACR,KAAK,SAAS,CAAC,YAAY;gBACzB,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;QACV,CAAC;IACH,CAAC,CAAC;IAEF,6FAA6F;IAC7F,+FAA+F;IAC/F,iGAAiG;IACjG,yCAAyC;IACzC,MAAM,kBAAkB,GAAG,GAAS,EAAE;QACpC,IAAI,EAAU,CAAC;QACf,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClD,WAAW,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAA4C,EAAE,CAAC;QACvE,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,kBAAkB,EAAE,CAAC;IACvB,CAAC;IACD,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAC3B,kBAAkB,EAAE,CAAC;IACrB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC;AAE5C;;;kBAGkB;AAClB,KAAK,UAAU,WAAW,CAAC,IAAmD;IAC5E,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,iDAAiD;QACnD,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAuB,EACvB,SAAS,GAAc,KAAK,EAC5B,SAAS,GAAW,oBAAoB;IAExC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,GAAG,IAAI,WAAW,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC5E,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,KAAK;YACb,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,OAAO,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,GAAU,EAAE,CAC/B,IAAI,KAAK,CACP,sBAAsB,SAAS,sDAAsD,CACtF,CAAC;YACJ,0FAA0F;YAC1F,uFAAuF;YACvF,+FAA+F;YAC/F,6FAA6F;YAC7F,+FAA+F;YAC/F,8EAA8E;YAC9E,IAAI,KAAgD,CAAC;YACrD,MAAM,cAAc,GAAG,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,EAAE;gBAC7D,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,EAAE;oBACvC,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE;oBAC5E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,wFAAwF;wBACxF,0DAA0D;wBAC1D,KAAK,EAAE,EAAE;wBACT,cAAc,EAAE,EAAE;qBACnB,CAAC;oBACF,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;gBAClE,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;oBACvB,yFAAyF;oBACzF,0FAA0F;oBAC1F,+EAA+E;oBAC/E,uFAAuF;oBACvF,KAAK,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;oBACzC,UAAU,CAAC,KAAK,EAAE,CAAC;oBACnB,MAAM,YAAY,EAAE,CAAC;gBACvB,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACjB,2EAA2E;oBAC3E,MAAM,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACjC,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAChF,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACnB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBACvE,CAAC;gBACD,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;gBACpE,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;oBACxB,kFAAkF;oBAClF,yFAAyF;oBACzF,KAAK,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;oBAC1C,UAAU,CAAC,KAAK,EAAE,CAAC;oBACnB,MAAM,YAAY,EAAE,CAAC;gBACvB,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;oBAAS,CAAC;gBACT,IAAI,KAAK;oBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,+FAA+F;AAC/F,MAAM,CAAC,MAAM,wBAAwB,GAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAEhG;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAuB,EACvB,YAAY,GAAsB,wBAAwB;IAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC;gBAC9B,QAAQ,EAAE,UAAU,EAAE;gBACtB,KAAK,EAAE,UAAU,EAAE;gBACnB,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;aACtE,CAAC,CAAC;YACH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAAuB,EACvB,YAAY,GAAsB,wBAAwB;IAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAqB,EAAE,CAAC;QACtC,8FAA8F;QAC9F,8FAA8F;QAC9F,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAkB,EAAE,CAAC;QAEnC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC;oBAC9B,QAAQ;oBACR,KAAK,EAAE,UAAU,EAAE;oBACnB,0FAA0F;oBAC1F,kBAAkB;oBAClB,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;iBACxB,CAAC,CAAC;gBACH,uFAAuF;gBACvF,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/E,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,QAAQ,CAAC,IAAI,CAAC;oBACZ,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC9D,CAAC,CAAC;gBACH,uFAAuF;gBACvF,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -78,7 +78,15 @@ export function askCommand(program, commandLineConfigOverrides) {
|
|
|
78
78
|
try {
|
|
79
79
|
({ ok } = await runSingleShot('ASK', getAskSystemPrompt(config), content.join('\n'), config, createResolvers(), 'ask',
|
|
80
80
|
// ask asks for the lean backend, the only one shipped; config.agent.backend names no other.
|
|
81
|
-
resolveAgentFactory(config, 'lean')
|
|
81
|
+
resolveAgentFactory(config, 'lean'),
|
|
82
|
+
// [[EXT-158]] — a person typed this verb and is reading what comes back, so a run that
|
|
83
|
+
// stopped with its own checklist unfinished says so. The harness callers of this same
|
|
84
|
+
// runtime (`batch`, `eval`, `workflow`) deliberately do not set it.
|
|
85
|
+
//
|
|
86
|
+
// [[EXT-178]] — and, on the same reading, this verb is eligible for the end-of-run recap.
|
|
87
|
+
// Eligible, not enabled: the user's `recap` rung decides whether a model call is actually
|
|
88
|
+
// made, and it is `off` unless they said otherwise.
|
|
89
|
+
{ announceOutstandingWork: true, announceRunRecap: true }));
|
|
82
90
|
}
|
|
83
91
|
catch (error) {
|
|
84
92
|
displayError(error instanceof Error ? error.message : String(error));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"askCommand.js","sourceRoot":"","sources":["../../src/commands/askCommand.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"askCommand.js","sourceRoot":"","sources":["../../src/commands/askCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export interface ProductionRunCellOptions {
|
|
|
26
26
|
wrapPrefix: string;
|
|
27
27
|
}
|
|
28
28
|
/**
|
|
29
|
-
* Build the injectable {@link RunCellFn} that adapts the shared single-shot runtime
|
|
29
|
+
* Build the injectable {@link @gaunt-sloth/batch!"types.js".RunCellFn | RunCellFn} that adapts the shared single-shot runtime
|
|
30
30
|
* (`runSingleShot`) to one matrix cell. Isolated in its own function so each cell run gets a fresh
|
|
31
31
|
* `createResolvers()` (its own MCP client instance) — matching batch's "N isolated model calls"
|
|
32
32
|
* contract (docs/batch-mechanism-vs-judgment.md) rather than sharing one resolver/client across
|
|
@@ -44,7 +44,7 @@ export interface ProductionRunCellOptions {
|
|
|
44
44
|
*/
|
|
45
45
|
export declare function buildProductionRunCell(baseConfig: GthConfig, preamble: string, commandLineConfigOverrides: CommandLineConfigOverrides, options: ProductionRunCellOptions): Promise<RunCellFn>;
|
|
46
46
|
/**
|
|
47
|
-
* BATCH-12 Task 2 — build the injectable {@link RunConversationFn} that adapts core's MULTI-TURN
|
|
47
|
+
* BATCH-12 Task 2 — build the injectable {@link @gaunt-sloth/batch!"evalTypes.js".RunConversationFn | RunConversationFn} that adapts core's MULTI-TURN
|
|
48
48
|
* `runConversation` to `gth eval`'s conversation seam. The multi-turn analogue of
|
|
49
49
|
* {@link buildProductionRunCell}: same fresh-`createResolvers()` per conversation + cleanup-on-
|
|
50
50
|
* every-path discipline, but it runs a whole scripted conversation (agent/tools built ONCE, messages
|
|
@@ -42,7 +42,7 @@ function createCellConfigResolver(baseConfig, commandLineConfigOverrides) {
|
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
/**
|
|
45
|
-
* Build the injectable {@link RunCellFn} that adapts the shared single-shot runtime
|
|
45
|
+
* Build the injectable {@link @gaunt-sloth/batch!"types.js".RunCellFn | RunCellFn} that adapts the shared single-shot runtime
|
|
46
46
|
* (`runSingleShot`) to one matrix cell. Isolated in its own function so each cell run gets a fresh
|
|
47
47
|
* `createResolvers()` (its own MCP client instance) — matching batch's "N isolated model calls"
|
|
48
48
|
* contract (docs/batch-mechanism-vs-judgment.md) rather than sharing one resolver/client across
|
|
@@ -106,7 +106,7 @@ export async function buildProductionRunCell(baseConfig, preamble, commandLineCo
|
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
108
|
/**
|
|
109
|
-
* BATCH-12 Task 2 — build the injectable {@link RunConversationFn} that adapts core's MULTI-TURN
|
|
109
|
+
* BATCH-12 Task 2 — build the injectable {@link @gaunt-sloth/batch!"evalTypes.js".RunConversationFn | RunConversationFn} that adapts core's MULTI-TURN
|
|
110
110
|
* `runConversation` to `gth eval`'s conversation seam. The multi-turn analogue of
|
|
111
111
|
* {@link buildProductionRunCell}: same fresh-`createResolvers()` per conversation + cleanup-on-
|
|
112
112
|
* every-path discipline, but it runs a whole scripted conversation (agent/tools built ONCE, messages
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { type CommandLineConfigOverrides, type GthConfig } from '@gaunt-sloth/core/config.js';
|
|
3
3
|
/**
|
|
4
|
-
* Produce a plain, printable, secret-free view of a fully-resolved
|
|
4
|
+
* Produce a plain, printable, secret-free view of a fully-resolved `GthConfig`.
|
|
5
5
|
*
|
|
6
6
|
* The resolved config carries live, non-serializable objects (the instantiated `llm`, tool
|
|
7
7
|
* instances, middleware); those are replaced with short descriptors so the output is readable
|
|
@@ -9,7 +9,7 @@ import { setExitCode } from '@gaunt-sloth/core/utils/systemUtils.js';
|
|
|
9
9
|
const SECRET_KEY_RE = /(api[-_]?key|secret|token|password|passwd|authorization|bearer|credential)/i;
|
|
10
10
|
const REDACTED = '***REDACTED***';
|
|
11
11
|
/**
|
|
12
|
-
* Produce a plain, printable, secret-free view of a fully-resolved
|
|
12
|
+
* Produce a plain, printable, secret-free view of a fully-resolved `GthConfig`.
|
|
13
13
|
*
|
|
14
14
|
* The resolved config carries live, non-serializable objects (the instantiated `llm`, tool
|
|
15
15
|
* instances, middleware); those are replaced with short descriptors so the output is readable
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Where {@link createProjectConfig} writes the scaffolded config. Mirrors {@link ConfigScope}
|
|
2
|
+
* Where {@link createProjectConfig} writes the scaffolded config. Mirrors {@link gaunt-sloth!commands/firstRunDialog.ConfigScope | ConfigScope}
|
|
3
3
|
* (firstRunDialog.ts) but as a destination the scriptable `gth init <provider>` path is told
|
|
4
4
|
* rather than a choice it asks for: `global: true` selects `~/.gsloth/` (or its named profile
|
|
5
5
|
* dir); `global: false`/omitted keeps the existing project default.
|
|
@@ -11,7 +11,7 @@ export declare function normalizeReporterNames(collected: string[]): string[];
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function isReporterFilePath(modulePath: string): boolean;
|
|
13
13
|
/**
|
|
14
|
-
* Resolve a `reporters` config module STRING to an absolute file path
|
|
14
|
+
* Resolve a `reporters` config module STRING to an absolute file path `importExternalFile` can
|
|
15
15
|
* load (BATCH-22 — the third-party-reporter enabler):
|
|
16
16
|
* - A **file path** ({@link isReporterFilePath}) keeps the original behavior: resolved against the
|
|
17
17
|
* PROJECT dir (the same base `readFileFromProjectDir` uses).
|
|
@@ -37,7 +37,7 @@ export function isReporterFilePath(modulePath) {
|
|
|
37
37
|
/^[a-zA-Z]:[\\/]/.test(modulePath));
|
|
38
38
|
}
|
|
39
39
|
/**
|
|
40
|
-
* Resolve a `reporters` config module STRING to an absolute file path
|
|
40
|
+
* Resolve a `reporters` config module STRING to an absolute file path `importExternalFile` can
|
|
41
41
|
* load (BATCH-22 — the third-party-reporter enabler):
|
|
42
42
|
* - A **file path** ({@link isReporterFilePath}) keeps the original behavior: resolved against the
|
|
43
43
|
* PROJECT dir (the same base `readFileFromProjectDir` uses).
|
|
@@ -77,7 +77,7 @@ export function resolveReporterModule(modulePath) {
|
|
|
77
77
|
*
|
|
78
78
|
* Each config reporter's module STRING is resolved by {@link resolveReporterModule} — a file path
|
|
79
79
|
* against the PROJECT dir, or a bare package specifier by node resolution against the PROJECT dir's
|
|
80
|
-
* `node_modules` — then imported via
|
|
80
|
+
* `node_modules` — then imported via `importExternalFile` (which turns the absolute path into a
|
|
81
81
|
* `file://` URL and supports `.ts` through jiti). Its DEFAULT export must be an `EvalReporterFactory`
|
|
82
82
|
* (`() => EvalReporter`); an unresolvable specifier, a missing file, a failed import, or a
|
|
83
83
|
* non-function default export THROWS — caught by the command's outer try/catch → exit 2 (harness
|
|
@@ -570,7 +570,12 @@ export function evalCommand(program, commandLineConfigOverrides) {
|
|
|
570
570
|
// from this config, exactly as for the external targets.
|
|
571
571
|
baseConfig = await initConfigForCell(commandLineConfigOverrides, sweepCell);
|
|
572
572
|
const { buildRaterClassifier } = await import('@gaunt-sloth/batch/raterTarget.js');
|
|
573
|
-
|
|
573
|
+
// [[BATCH-31]] — and the cell's PROMPT ARM, which is the one override that does not
|
|
574
|
+
// travel through `baseConfig`. It is handed over separately on purpose: a note omission
|
|
575
|
+
// that could ride the config would be settable wherever a config is, which is exactly
|
|
576
|
+
// the reachability the node forbids. `undefined` when no axis declares one, which is
|
|
577
|
+
// every suite written before this and the whole `rung × model` sweep.
|
|
578
|
+
classify = await buildRaterClassifier(parsedSuite.target, baseConfig, sweepCell?.notes !== undefined ? { notes: sweepCell.notes } : undefined);
|
|
574
579
|
}
|
|
575
580
|
else {
|
|
576
581
|
// gth-agent, NO identities (unchanged): one runCell/runConversation under the invoked
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evalCommand.js","sourceRoot":"","sources":["../../src/commands/evalCommand.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evalCommand.js","sourceRoot":"","sources":["../../src/commands/evalCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ interface ExecCommandOptions {
|
|
|
30
30
|
* `-w/--write-output-to-file` is a PROGRAM-level option, so commander puts it on the program and
|
|
31
31
|
* never on this subcommand's own `options` — it reaches a command as
|
|
32
32
|
* `commandLineConfigOverrides.writeOutputToFile`, which is why it is a parameter here rather than
|
|
33
|
-
* a field of
|
|
33
|
+
* a field of `ExecCommandOptions`. That override object is also the only thing that can tell
|
|
34
34
|
* an explicit `-w` apart from a project config's `writeOutputToFile`: the merged `config` carries
|
|
35
35
|
* both, and exec must keep piping cleanly under a config that turns reports on generally, so a
|
|
36
36
|
* config-level value stays off and only the flag switches it on.
|
|
@@ -17,7 +17,7 @@ import { readMultipleFilesFromProjectDir } from '@gaunt-sloth/core/utils/fileUti
|
|
|
17
17
|
* `-w/--write-output-to-file` is a PROGRAM-level option, so commander puts it on the program and
|
|
18
18
|
* never on this subcommand's own `options` — it reaches a command as
|
|
19
19
|
* `commandLineConfigOverrides.writeOutputToFile`, which is why it is a parameter here rather than
|
|
20
|
-
* a field of
|
|
20
|
+
* a field of `ExecCommandOptions`. That override object is also the only thing that can tell
|
|
21
21
|
* an explicit `-w` apart from a project config's `writeOutputToFile`: the merged `config` carries
|
|
22
22
|
* both, and exec must keep piping cleanly under a config that turns reports on generally, so a
|
|
23
23
|
* config-level value stays off and only the flag switches it on.
|
|
@@ -115,7 +115,14 @@ export function execCommand(program, commandLineConfigOverrides) {
|
|
|
115
115
|
try {
|
|
116
116
|
({ ok } = await runSingleShot('EXEC', getExecSystemPrompt(execConfig), content.join('\n'), execConfig, createResolvers(), 'exec',
|
|
117
117
|
// exec asks for the lean backend, the only one shipped; config.agent.backend names no other.
|
|
118
|
-
resolveAgentFactory(execConfig, 'lean')
|
|
118
|
+
resolveAgentFactory(execConfig, 'lean'),
|
|
119
|
+
// [[EXT-158]] — the same reading as `ask`: a person is watching this verb. The notice
|
|
120
|
+
// goes to stderr, so a script piping `exec`'s stdout sees byte-for-byte what it did.
|
|
121
|
+
//
|
|
122
|
+
// [[EXT-178]] — and eligible for the end-of-run recap, which shares that property: it is
|
|
123
|
+
// rendered on stderr and the answer on stdout is untouched. Whether one is produced is
|
|
124
|
+
// the user's `recap` rung, `off` by default.
|
|
125
|
+
{ announceOutstandingWork: true, announceRunRecap: true }));
|
|
119
126
|
}
|
|
120
127
|
catch (error) {
|
|
121
128
|
displayError(error instanceof Error ? error.message : String(error));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execCommand.js","sourceRoot":"","sources":["../../src/commands/execCommand.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"execCommand.js","sourceRoot":"","sources":["../../src/commands/execCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAmBvF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAiB,EACjB,OAA2B,EAC3B,0BAAsD;IAEtD,MAAM,UAAU,GAAc;QAC5B,GAAG,MAAM;QACT,uEAAuE;QACvE,4BAA4B,EAAE,KAAK;QACnC,+EAA+E;QAC/E,iBAAiB,EAAE,0BAA0B,CAAC,iBAAiB,IAAI,KAAK;QACxE,6EAA6E;QAC7E,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5F,CAAC;IAEF,+FAA+F;IAC/F,4FAA4F;IAC5F,6EAA6E;IAC7E,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,IAAI,UAAU,CAAC,GAAG,IAAI,aAAa,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;QAC1F,UAAU,CAAC,GAA0C,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAC3F,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,WAAW,CACzB,OAAgB,EAChB,0BAAsD;IAEtD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,8FAA8F,CAC/F;SACA,QAAQ,CAAC,UAAU,EAAE,mCAAmC,CAAC;SACzD,MAAM,CACL,sBAAsB,EACtB,kGAAkG,CACnG;SACA,MAAM,CACL,uBAAuB,EACvB,qEAAqE,CACtE;SACA,MAAM,CACL,4BAA4B,EAC5B,gEAAgE,EAChE,UAAU,CACX;SACA,MAAM,CACL,oBAAoB,EACpB,0FAA0F;QACxF,uFAAuF;QACvF,+CAA+C,EACjD,CAAC,KAAa,EAAE,QAAQ,GAAa,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CACjE;SACA,WAAW,CACV,OAAO,EACP,IAAI;QACF,aAAa;QACb,yCAAyC;QACzC,kEAAkE;QAClE,8CAA8C;QAC9C,+DAA+D;QAC/D,6DAA6D,CAChE;SACA,MAAM,CAAC,KAAK,EAAE,MAA0B,EAAE,OAA2B,EAAE,EAAE;QACxE,yFAAyF;QACzF,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,0BAA0B,CAAC,CAAC;QAE5D,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,gEAAgE;QAChE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,WAAW,GAAG,+BAA+B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,0CAA0C;QAC1C,4DAA4D;QAC5D,qCAAqC;QACrC,oBAAoB;QACpB,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC;QACzF,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,MAAM,aAAa,GAAG,+BAA+B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAChE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,eAAe,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,QAAQ,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC;QACzF,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,cAAc,CACZ,8CAA8C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;gBAChF,oFAAoF,CACvF,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAEhF,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yCAAyC,CAAC,CAAC;QAClF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QAC5E,MAAM,EAAE,mBAAmB,EAAE,GAC3B,MAAM,MAAM,CAAC,gDAAgD,CAAC,CAAC;QAEjE,IAAI,EAAE,GAAG,KAAK,CAAC;QACf,IAAI,CAAC;YACH,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,aAAa,CAC3B,MAAM,EACN,mBAAmB,CAAC,UAAU,CAAC,EAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAClB,UAAU,EACV,eAAe,EAAE,EACjB,MAAM;YACN,6FAA6F;YAC7F,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC;YACvC,sFAAsF;YACtF,qFAAqF;YACrF,EAAE;YACF,yFAAyF;YACzF,uFAAuF;YACvF,6CAA6C;YAC7C,EAAE,uBAAuB,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC1D,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACrE,EAAE,GAAG,KAAK,CAAC;QACb,CAAC;QAED,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,WAAW,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -24,7 +24,7 @@ export type SelectFn = (title: string, options: string[], defaultIndex: number)
|
|
|
24
24
|
export interface FirstRunDialogDeps {
|
|
25
25
|
detectProviders: typeof detectProviders;
|
|
26
26
|
/**
|
|
27
|
-
* CFG-21 — fetches the chosen provider's model list WITH its {@link ModelDiscoveryResult}
|
|
27
|
+
* CFG-21 — fetches the chosen provider's model list WITH its {@link @gaunt-sloth/core!providers/modelDiscovery.ModelDiscoveryResult | ModelDiscoveryResult}
|
|
28
28
|
* provenance, baking in the generous interactive timeout by default. Returns `{ models, status }`
|
|
29
29
|
* so the dialog can surface an honest degrade notice when a live fetch was attempted and failed
|
|
30
30
|
* (`status: 'fallback'`) rather than silently swapping in a by-design curated list (`'curated'`).
|
|
@@ -65,7 +65,7 @@ export declare function parseMenuSelection(answer: string, count: number): numbe
|
|
|
65
65
|
export declare function defaultModelIndex(models: ModelInfo[]): number;
|
|
66
66
|
/**
|
|
67
67
|
* Builds the `.gsloth.config.json` body for a chosen provider + model. Delegates to the shared
|
|
68
|
-
* {@link buildInitConfigContent} so the interactive first-run path stamps the same `$schema`
|
|
68
|
+
* {@link @gaunt-sloth/core!providers/modelDiscovery.buildInitConfigContent | buildInitConfigContent} so the interactive first-run path stamps the same `$schema`
|
|
69
69
|
* pointer (GS2-1) as the per-provider template writers. Previously this local builder omitted
|
|
70
70
|
* `$schema`, so a config created through the first-run dialog got no editor autocomplete/validation.
|
|
71
71
|
* First-run always has an explicit model chosen, so it is written into the config (unlike a bare
|
|
@@ -89,7 +89,7 @@ export declare function providerReadinessLabel(provider: DetectedProvider): stri
|
|
|
89
89
|
/**
|
|
90
90
|
* CFG-21 — the default {@link FirstRunDialogDeps.withProgress}: an Ink spinner while `run` is in
|
|
91
91
|
* flight when the environment can drive interactive Ink (the same activation policy as
|
|
92
|
-
*
|
|
92
|
+
* `makeDefaultSelect`), otherwise a plain printed line via {@link @gaunt-sloth/core!utils/consoleUtils.displayInfo | displayInfo} on the
|
|
93
93
|
* readline / non-TTY path. Either way the wait is visible, never silent. The Ink module is
|
|
94
94
|
* imported lazily so a readline-only run never loads React/Ink.
|
|
95
95
|
*/
|