experimental-ash 0.2.0-alpha.29 → 0.2.0-alpha.30
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/dist/src/channel/slack-channel.d.ts.map +1 -1
- package/dist/src/channel/slack-channel.js +3 -1
- package/dist/src/channel/slack-channel.js.map +1 -1
- package/dist/src/channel/slack-render.d.ts +2 -1
- package/dist/src/channel/slack-render.d.ts.map +1 -1
- package/dist/src/channel/slack-render.js +43 -0
- package/dist/src/channel/slack-render.js.map +1 -1
- package/dist/src/channel/slack-types.d.ts +10 -1
- package/dist/src/channel/slack-types.d.ts.map +1 -1
- package/dist/src/execution/session.d.ts +1 -3
- package/dist/src/execution/session.d.ts.map +1 -1
- package/dist/src/execution/session.js +9 -5
- package/dist/src/execution/session.js.map +1 -1
- package/dist/src/harness/compaction.d.ts +9 -33
- package/dist/src/harness/compaction.d.ts.map +1 -1
- package/dist/src/harness/compaction.js +92 -143
- package/dist/src/harness/compaction.js.map +1 -1
- package/dist/src/harness/step-hooks.d.ts +7 -6
- package/dist/src/harness/step-hooks.d.ts.map +1 -1
- package/dist/src/harness/step-hooks.js +7 -14
- package/dist/src/harness/step-hooks.js.map +1 -1
- package/dist/src/harness/tool-loop.d.ts.map +1 -1
- package/dist/src/harness/tool-loop.js +17 -17
- package/dist/src/harness/tool-loop.js.map +1 -1
- package/dist/src/harness/types.d.ts +3 -9
- package/dist/src/harness/types.d.ts.map +1 -1
- package/dist/src/internal/application/package.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-channel.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"slack-channel.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -327,7 +327,9 @@ export function deriveInputResponsesFromInteraction(interaction) {
|
|
|
327
327
|
inputResponses.push({ optionId: action.actionId, requestId: action.value });
|
|
328
328
|
continue;
|
|
329
329
|
}
|
|
330
|
-
if (action.kind === "
|
|
330
|
+
if (action.kind === "radio_buttons" ||
|
|
331
|
+
action.kind === "static_select" ||
|
|
332
|
+
action.kind === "external_select") {
|
|
331
333
|
if (action.selectedOptionId === undefined) {
|
|
332
334
|
continue;
|
|
333
335
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-channel.js","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"slack-channel.js","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Actions, AdapterPostableMessage, Button, Card, CardText, Message, Select, SelectOption, Table } from "chat";
|
|
1
|
+
import type { Actions, AdapterPostableMessage, Button, Card, CardText, Message, RadioSelect, Select, SelectOption, Table } from "chat";
|
|
2
2
|
import type { InputRequest } from "../runtime/input/types.js";
|
|
3
3
|
import type { SlackRenderable, SlackThreadMessage } from "./slack-types.js";
|
|
4
4
|
interface SlackCardKit {
|
|
@@ -6,6 +6,7 @@ interface SlackCardKit {
|
|
|
6
6
|
Button: typeof Button;
|
|
7
7
|
Card: typeof Card;
|
|
8
8
|
CardText: typeof CardText;
|
|
9
|
+
RadioSelect: typeof RadioSelect;
|
|
9
10
|
Select: typeof Select;
|
|
10
11
|
SelectOption: typeof SelectOption;
|
|
11
12
|
Table: typeof Table;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-render.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-render.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EACP,sBAAsB,EACtB,MAAM,EAEN,IAAI,EAEJ,QAAQ,EAER,OAAO,EACP,MAAM,EAEN,YAAY,EACZ,KAAK,EACN,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"slack-render.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-render.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EACP,sBAAsB,EACtB,MAAM,EAEN,IAAI,EAEJ,QAAQ,EAER,OAAO,EACP,WAAW,EAEX,MAAM,EAEN,YAAY,EACZ,KAAK,EACN,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAMV,eAAe,EAGf,kBAAkB,EAEnB,MAAM,kBAAkB,CAAC;AAE1B,UAAU,YAAY;IACpB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB,MAAM,EAAE,OAAO,MAAM,CAAC;IACtB,IAAI,EAAE,OAAO,IAAI,CAAC;IAClB,QAAQ,EAAE,OAAO,QAAQ,CAAC;IAC1B,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,MAAM,EAAE,OAAO,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,KAAK,EAAE,OAAO,KAAK,CAAC;CACrB;AAaD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,cAAc,MAAM,CAAC,GAAG,YAAY,CAWlF;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,YAAY,GAAG,eAAe,CAyEvF;AAUD,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAC3B,GAAG,EAAE,YAAY,GAChB,sBAAsB,CAmBxB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,kBAAkB,CAazE"}
|
|
@@ -4,12 +4,14 @@ const INPUT_OPTION_STYLE_TO_BUTTON_STYLE = {
|
|
|
4
4
|
default: undefined,
|
|
5
5
|
primary: "primary",
|
|
6
6
|
};
|
|
7
|
+
const RADIO_SELECT_OPTION_LIMIT = 6;
|
|
7
8
|
export function createSlackCardKit(chatModule) {
|
|
8
9
|
return {
|
|
9
10
|
Actions: chatModule.Actions,
|
|
10
11
|
Button: chatModule.Button,
|
|
11
12
|
Card: chatModule.Card,
|
|
12
13
|
CardText: chatModule.CardText,
|
|
14
|
+
RadioSelect: chatModule.RadioSelect,
|
|
13
15
|
Select: chatModule.Select,
|
|
14
16
|
SelectOption: chatModule.SelectOption,
|
|
15
17
|
Table: chatModule.Table,
|
|
@@ -35,6 +37,29 @@ export function buildSlackInputRequestRenderable(request) {
|
|
|
35
37
|
};
|
|
36
38
|
}
|
|
37
39
|
if (request.display === "select" && request.options !== undefined && request.options.length > 0) {
|
|
40
|
+
if (shouldRenderSelectAsRadioSelect(request)) {
|
|
41
|
+
return {
|
|
42
|
+
blocks: [
|
|
43
|
+
{ kind: "text", text: request.prompt },
|
|
44
|
+
{
|
|
45
|
+
actions: [
|
|
46
|
+
{
|
|
47
|
+
actionId: `select_${request.requestId}`,
|
|
48
|
+
kind: "radio_select",
|
|
49
|
+
label: "Choose an option",
|
|
50
|
+
options: request.options.map((opt) => ({
|
|
51
|
+
description: opt.description,
|
|
52
|
+
label: opt.label,
|
|
53
|
+
value: opt.id,
|
|
54
|
+
})),
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
kind: "actions",
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
kind: "card",
|
|
61
|
+
};
|
|
62
|
+
}
|
|
38
63
|
return {
|
|
39
64
|
blocks: [
|
|
40
65
|
{ kind: "text", text: request.prompt },
|
|
@@ -63,6 +88,12 @@ export function buildSlackInputRequestRenderable(request) {
|
|
|
63
88
|
kind: "card",
|
|
64
89
|
};
|
|
65
90
|
}
|
|
91
|
+
function shouldRenderSelectAsRadioSelect(request) {
|
|
92
|
+
if (request.options === undefined) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
return request.options.length <= RADIO_SELECT_OPTION_LIMIT;
|
|
96
|
+
}
|
|
66
97
|
export function toSlackPostableMessage(renderable, kit) {
|
|
67
98
|
const files = toSlackFileUploads(renderable.files);
|
|
68
99
|
if (renderable.kind === "markdown") {
|
|
@@ -122,9 +153,21 @@ function toSlackActionElement(action, kit) {
|
|
|
122
153
|
value: action.value,
|
|
123
154
|
});
|
|
124
155
|
}
|
|
156
|
+
if (action.kind === "radio_select") {
|
|
157
|
+
return kit.RadioSelect({
|
|
158
|
+
id: action.actionId,
|
|
159
|
+
label: action.label,
|
|
160
|
+
options: action.options.map((option) => kit.SelectOption({
|
|
161
|
+
description: option.description,
|
|
162
|
+
label: option.label,
|
|
163
|
+
value: option.value,
|
|
164
|
+
})),
|
|
165
|
+
});
|
|
166
|
+
}
|
|
125
167
|
return kit.Select({
|
|
126
168
|
id: action.actionId,
|
|
127
169
|
label: action.label,
|
|
170
|
+
placeholder: action.label,
|
|
128
171
|
options: action.options.map((option) => kit.SelectOption({
|
|
129
172
|
description: option.description,
|
|
130
173
|
label: option.label,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-render.js","sourceRoot":"","sources":["../../../src/channel/slack-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"slack-render.js","sourceRoot":"","sources":["../../../src/channel/slack-render.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,11 +62,20 @@ export interface SlackSelectAction {
|
|
|
62
62
|
readonly options: readonly SlackSelectOption[];
|
|
63
63
|
readonly source?: "external" | "static";
|
|
64
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* Radio-select action inside a structured Slack card.
|
|
67
|
+
*/
|
|
68
|
+
export interface SlackRadioSelectAction {
|
|
69
|
+
readonly actionId: string;
|
|
70
|
+
readonly kind: "radio_select";
|
|
71
|
+
readonly label: string;
|
|
72
|
+
readonly options: readonly SlackSelectOption[];
|
|
73
|
+
}
|
|
65
74
|
/**
|
|
66
75
|
* Interactive action row inside a structured Slack card.
|
|
67
76
|
*/
|
|
68
77
|
export interface SlackActionsBlock {
|
|
69
|
-
readonly actions: readonly (SlackButtonAction | SlackSelectAction)[];
|
|
78
|
+
readonly actions: readonly (SlackButtonAction | SlackRadioSelectAction | SlackSelectAction)[];
|
|
70
79
|
readonly kind: "actions";
|
|
71
80
|
}
|
|
72
81
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-types.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;CAC/C;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"slack-types.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,10 @@ import type { RuntimeTurnAgent } from "../runtime/agent/bootstrap.js";
|
|
|
5
5
|
*/
|
|
6
6
|
export declare function createCompactionConfig(input?: {
|
|
7
7
|
readonly contextWindowTokens?: number;
|
|
8
|
-
readonly lastEstimatedInputTokens?: number;
|
|
9
8
|
readonly lastKnownInputTokens?: number;
|
|
9
|
+
readonly lastKnownPromptMessageCount?: number;
|
|
10
10
|
readonly thresholdPercent?: number;
|
|
11
11
|
}): {
|
|
12
|
-
lastEstimatedInputTokens?: number;
|
|
13
|
-
lastKnownInputTokens?: number;
|
|
14
12
|
recentWindowSize: number;
|
|
15
13
|
threshold: number;
|
|
16
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAMtE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,GAAE;IACL,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAMtE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,GAAE;IACL,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC/B;;;EAgCP;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,cAAc,CAoBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;CACH,GAAG,cAAc,CAiBjB;AAED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAEtD"}
|
|
@@ -14,11 +14,15 @@ export function createCompactionConfig(input = {}) {
|
|
|
14
14
|
recentWindowSize: DEFAULT_COMPACTION_RECENT_WINDOW_SIZE,
|
|
15
15
|
threshold,
|
|
16
16
|
};
|
|
17
|
-
if (input.lastEstimatedInputTokens !== undefined) {
|
|
18
|
-
config.lastEstimatedInputTokens = input.lastEstimatedInputTokens;
|
|
19
|
-
}
|
|
20
17
|
if (input.lastKnownInputTokens !== undefined) {
|
|
21
|
-
|
|
18
|
+
const exactConfig = {
|
|
19
|
+
...config,
|
|
20
|
+
lastKnownInputTokens: input.lastKnownInputTokens,
|
|
21
|
+
};
|
|
22
|
+
if (input.lastKnownPromptMessageCount !== undefined) {
|
|
23
|
+
exactConfig.lastKnownPromptMessageCount = input.lastKnownPromptMessageCount;
|
|
24
|
+
}
|
|
25
|
+
return exactConfig;
|
|
22
26
|
}
|
|
23
27
|
return config;
|
|
24
28
|
}
|
|
@@ -71,8 +75,8 @@ export function refreshSessionFromTurnAgent(input) {
|
|
|
71
75
|
},
|
|
72
76
|
compaction: createCompactionConfig({
|
|
73
77
|
contextWindowTokens: input.turnAgent.model.contextWindowTokens,
|
|
74
|
-
lastEstimatedInputTokens: input.session.compaction.lastEstimatedInputTokens,
|
|
75
78
|
lastKnownInputTokens: input.session.compaction.lastKnownInputTokens,
|
|
79
|
+
lastKnownPromptMessageCount: input.session.compaction.lastKnownPromptMessageCount,
|
|
76
80
|
thresholdPercent: input.compactionOverrides?.thresholdPercent,
|
|
77
81
|
}),
|
|
78
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAIrE,MAAM,qCAAqC,GAAG,EAAE,CAAC;AACjD,MAAM,oCAAoC,GAAG,GAAG,CAAC;AACjD,MAAM,6BAA6B,GAAG,OAAO,CAAC;AAE9C;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAKI,EAAE;IAEN,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,oCAAoC,CAAC;IACxF,MAAM,SAAS,GACb,KAAK,CAAC,mBAAmB,KAAK,SAAS;QACrC,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAE5E,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,45 +1,22 @@
|
|
|
1
1
|
import { generateText, type LanguageModel, type ModelMessage, type TelemetrySettings } from "ai";
|
|
2
2
|
import type { RuntimeModelReference } from "../runtime/agent/bootstrap.js";
|
|
3
|
-
import type { CompactionConfig,
|
|
4
|
-
type CompactionAgentInput = Pick<SessionAgent, "system" | "tools">;
|
|
5
|
-
type CompactionProviderOptions = Parameters<typeof generateText>[0]["providerOptions"];
|
|
3
|
+
import type { CompactionConfig, ToolLoopHarnessConfig } from "./types.js";
|
|
6
4
|
/**
|
|
7
|
-
*
|
|
5
|
+
* Rough token estimate based on character length. Good enough for deciding
|
|
6
|
+
* whether compaction is needed.
|
|
8
7
|
*/
|
|
9
|
-
export
|
|
10
|
-
readonly agent: Pick<SessionAgent, "system" | "tools">;
|
|
11
|
-
readonly messages: readonly ModelMessage[];
|
|
12
|
-
}
|
|
13
|
-
/**
|
|
14
|
-
* Input used to decide whether the current prompt should be compacted.
|
|
15
|
-
*/
|
|
16
|
-
export interface PromptTokenCountInput extends PromptTokenEstimateInput {
|
|
17
|
-
readonly compaction: CompactionConfig;
|
|
18
|
-
}
|
|
19
|
-
/**
|
|
20
|
-
* Rough token estimate based on character length.
|
|
21
|
-
*/
|
|
22
|
-
export declare function estimateTokens(value: string): number;
|
|
23
|
-
/**
|
|
24
|
-
* Estimates the size of the full model prompt Ash will send for one step.
|
|
25
|
-
*
|
|
26
|
-
* Includes the durable system prompt, serialized tool definitions, and the
|
|
27
|
-
* current conversation messages so compaction accounts for tool-heavy
|
|
28
|
-
* continuation steps before the next model call.
|
|
29
|
-
*/
|
|
30
|
-
export declare function estimatePromptTokens(input: PromptTokenEstimateInput): number;
|
|
8
|
+
export declare function estimateTokens(messages: readonly ModelMessage[]): number;
|
|
31
9
|
/**
|
|
32
10
|
* Returns the best available input-token count for compaction decisions.
|
|
33
11
|
*
|
|
34
|
-
* Uses
|
|
35
|
-
*
|
|
36
|
-
* prompt size from the exact count and the change in Ash's heuristic estimate.
|
|
12
|
+
* Uses exact model-reported input tokens from the previous step when present,
|
|
13
|
+
* and falls back to the local heuristic only before the first counted step.
|
|
37
14
|
*/
|
|
38
|
-
export declare function getInputTokenCount(
|
|
15
|
+
export declare function getInputTokenCount(messages: readonly ModelMessage[], config: CompactionConfig): number;
|
|
39
16
|
/**
|
|
40
17
|
* Returns true when the message history exceeds the compaction threshold.
|
|
41
18
|
*/
|
|
42
|
-
export declare function shouldCompact(
|
|
19
|
+
export declare function shouldCompact(messages: readonly ModelMessage[], config: CompactionConfig): boolean;
|
|
43
20
|
/**
|
|
44
21
|
* Resolves the model used to summarize older context during compaction.
|
|
45
22
|
*
|
|
@@ -59,6 +36,5 @@ export declare function resolveCompactionModel(input: {
|
|
|
59
36
|
* Compacts messages by summarizing older history and keeping only the most
|
|
60
37
|
* recent messages.
|
|
61
38
|
*/
|
|
62
|
-
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig,
|
|
63
|
-
export {};
|
|
39
|
+
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig, providerOptions?: Parameters<typeof generateText>[0]["providerOptions"], telemetry?: TelemetrySettings): Promise<ModelMessage[]>;
|
|
64
40
|
//# sourceMappingURL=compaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAwB1E;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAExE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAgBR;AA6FD;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAC9D,GAAG,OAAO,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACjF,CAAC,CAWD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,gBAAgB,EACxB,eAAe,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvE,SAAS,CAAC,EAAE,iBAAiB,GAC5B,OAAO,CAAC,YAAY,EAAE,CAAC,CAmBzB"}
|
|
@@ -8,60 +8,110 @@ const COMPACTION_SYSTEM_PROMPT = [
|
|
|
8
8
|
"Do not answer questions or invent facts.",
|
|
9
9
|
].join(" ");
|
|
10
10
|
const COMPACTION_TEXT_LIMIT = 280;
|
|
11
|
-
const COMPACTION_CHECKPOINT_TEXT_LIMIT = 2_000;
|
|
12
11
|
const COMPACTION_COLLECTION_LIMIT = 3;
|
|
13
12
|
/**
|
|
14
|
-
* Rough token estimate based on character length.
|
|
13
|
+
* Rough token estimate based on character length. Good enough for deciding
|
|
14
|
+
* whether compaction is needed.
|
|
15
15
|
*/
|
|
16
|
-
export function estimateTokens(
|
|
17
|
-
|
|
18
|
-
if (trimmed.length === 0) {
|
|
19
|
-
return 0;
|
|
20
|
-
}
|
|
21
|
-
return Math.ceil(trimmed.length / 4);
|
|
16
|
+
export function estimateTokens(messages) {
|
|
17
|
+
return messages.reduce((total, message) => total + estimateMessageContentTokens(message), 0);
|
|
22
18
|
}
|
|
23
19
|
/**
|
|
24
|
-
*
|
|
20
|
+
* Returns the best available input-token count for compaction decisions.
|
|
25
21
|
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
* continuation steps before the next model call.
|
|
22
|
+
* Uses exact model-reported input tokens from the previous step when present,
|
|
23
|
+
* and falls back to the local heuristic only before the first counted step.
|
|
29
24
|
*/
|
|
30
|
-
export function
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
25
|
+
export function getInputTokenCount(messages, config) {
|
|
26
|
+
if (config.lastKnownInputTokens === undefined) {
|
|
27
|
+
return estimateTokens(messages);
|
|
28
|
+
}
|
|
29
|
+
const promptMessageCount = config.lastKnownPromptMessageCount;
|
|
30
|
+
if (promptMessageCount === undefined ||
|
|
31
|
+
!Number.isInteger(promptMessageCount) ||
|
|
32
|
+
promptMessageCount < 0 ||
|
|
33
|
+
promptMessageCount > messages.length) {
|
|
34
|
+
return estimateTokens(messages);
|
|
34
35
|
}
|
|
35
|
-
|
|
36
|
-
|
|
36
|
+
return config.lastKnownInputTokens + estimateTokens(messages.slice(promptMessageCount));
|
|
37
|
+
}
|
|
38
|
+
function estimateMessageContentTokens(message) {
|
|
39
|
+
if (typeof message.content === "string") {
|
|
40
|
+
return estimateStringTokens(message.content);
|
|
37
41
|
}
|
|
38
|
-
|
|
39
|
-
|
|
42
|
+
if (!Array.isArray(message.content)) {
|
|
43
|
+
return 0;
|
|
40
44
|
}
|
|
41
|
-
return
|
|
45
|
+
return message.content.reduce((total, part) => total + estimateContentPartTokens(part), 0);
|
|
42
46
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
47
|
+
function estimateContentPartTokens(part) {
|
|
48
|
+
switch (part.type) {
|
|
49
|
+
case "text":
|
|
50
|
+
return estimateStringTokens(part.text);
|
|
51
|
+
case "reasoning":
|
|
52
|
+
return 0;
|
|
53
|
+
case "tool-call":
|
|
54
|
+
return estimateToolCallTokens(part);
|
|
55
|
+
case "tool-result":
|
|
56
|
+
return estimateToolResultTokens(part);
|
|
57
|
+
default:
|
|
58
|
+
return estimateSerializedValueTokens(part);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
function estimateToolCallTokens(part) {
|
|
62
|
+
const input = part.input ?? part.args;
|
|
63
|
+
return estimateStringTokens(part.toolName) + estimateSerializedValueTokens(input);
|
|
64
|
+
}
|
|
65
|
+
function estimateToolResultTokens(part) {
|
|
66
|
+
return estimateStringTokens(part.toolName) + estimateSerializedValueTokens(part.output);
|
|
67
|
+
}
|
|
68
|
+
function estimateSerializedValueTokens(value) {
|
|
69
|
+
const serialized = serializeEstimateValue(value);
|
|
70
|
+
return serialized.length === 0 ? 0 : estimateStringTokens(serialized);
|
|
71
|
+
}
|
|
72
|
+
function estimateStringTokens(value) {
|
|
73
|
+
return value.length / 4;
|
|
74
|
+
}
|
|
75
|
+
function serializeEstimateValue(value) {
|
|
76
|
+
if (value === undefined) {
|
|
77
|
+
return "";
|
|
78
|
+
}
|
|
79
|
+
if (typeof value === "string") {
|
|
80
|
+
return value;
|
|
81
|
+
}
|
|
82
|
+
if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
|
|
83
|
+
return String(value);
|
|
84
|
+
}
|
|
85
|
+
if (value instanceof Error) {
|
|
86
|
+
return JSON.stringify({
|
|
87
|
+
message: value.message,
|
|
88
|
+
name: value.name,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
try {
|
|
92
|
+
const serialized = JSON.stringify(value, (_key, nested) => {
|
|
93
|
+
if (typeof nested === "bigint") {
|
|
94
|
+
return String(nested);
|
|
95
|
+
}
|
|
96
|
+
if (nested instanceof Error) {
|
|
97
|
+
return {
|
|
98
|
+
message: nested.message,
|
|
99
|
+
name: nested.name,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
return nested;
|
|
103
|
+
});
|
|
104
|
+
return serialized ?? String(value);
|
|
105
|
+
}
|
|
106
|
+
catch {
|
|
107
|
+
return String(value);
|
|
56
108
|
}
|
|
57
|
-
const projectedPromptTokens = lastKnownInputTokens + (estimatedPromptTokens - lastEstimatedInputTokens);
|
|
58
|
-
return Math.max(estimatedPromptTokens, projectedPromptTokens);
|
|
59
109
|
}
|
|
60
110
|
/**
|
|
61
111
|
* Returns true when the message history exceeds the compaction threshold.
|
|
62
112
|
*/
|
|
63
|
-
export function shouldCompact(
|
|
64
|
-
return getInputTokenCount(
|
|
113
|
+
export function shouldCompact(messages, config) {
|
|
114
|
+
return getInputTokenCount(messages, config) > config.threshold;
|
|
65
115
|
}
|
|
66
116
|
/**
|
|
67
117
|
* Resolves the model used to summarize older context during compaction.
|
|
@@ -81,8 +131,7 @@ export async function resolveCompactionModel(input) {
|
|
|
81
131
|
* Compacts messages by summarizing older history and keeping only the most
|
|
82
132
|
* recent messages.
|
|
83
133
|
*/
|
|
84
|
-
export async function compactMessages(messages, model, config,
|
|
85
|
-
const resolvedInput = resolveCompactMessagesInput(agentOrProviderOptions, providerOptionsOrTelemetry, telemetryArg);
|
|
134
|
+
export async function compactMessages(messages, model, config, providerOptions, telemetry) {
|
|
86
135
|
const keep = config.recentWindowSize;
|
|
87
136
|
const older = messages.slice(0, -keep);
|
|
88
137
|
const recent = messages.slice(-keep);
|
|
@@ -91,26 +140,14 @@ export async function compactMessages(messages, model, config, agentOrProviderOp
|
|
|
91
140
|
role: message.role,
|
|
92
141
|
}));
|
|
93
142
|
const result = await generateText({
|
|
94
|
-
experimental_telemetry:
|
|
95
|
-
? { ...resolvedInput.telemetry, functionId: "ash.compaction" }
|
|
96
|
-
: undefined,
|
|
143
|
+
experimental_telemetry: telemetry ? { ...telemetry, functionId: "ash.compaction" } : undefined,
|
|
97
144
|
model,
|
|
98
145
|
prompt: formatCompactionPrompt(prunedOlder),
|
|
99
|
-
providerOptions
|
|
146
|
+
providerOptions,
|
|
100
147
|
system: COMPACTION_SYSTEM_PROMPT,
|
|
101
148
|
temperature: 0,
|
|
102
149
|
});
|
|
103
|
-
|
|
104
|
-
const compacted = [summaryMessage, ...recent];
|
|
105
|
-
if (resolvedInput.agent === undefined) {
|
|
106
|
-
return compacted;
|
|
107
|
-
}
|
|
108
|
-
return fitCompactedMessages({
|
|
109
|
-
agent: resolvedInput.agent,
|
|
110
|
-
config,
|
|
111
|
-
recent,
|
|
112
|
-
summaryMessage,
|
|
113
|
-
});
|
|
150
|
+
return [{ content: `Previous context: ${result.text}`, role: "system" }, ...recent];
|
|
114
151
|
}
|
|
115
152
|
function formatCompactionPrompt(messages) {
|
|
116
153
|
const sections = messages
|
|
@@ -121,76 +158,6 @@ function formatCompactionPrompt(messages) {
|
|
|
121
158
|
}
|
|
122
159
|
return ["Conversation transcript:", ...sections].join("\n\n");
|
|
123
160
|
}
|
|
124
|
-
function resolveCompactMessagesInput(agentOrProviderOptions, providerOptionsOrTelemetry, telemetryArg) {
|
|
125
|
-
if (isCompactionAgentInput(agentOrProviderOptions)) {
|
|
126
|
-
return {
|
|
127
|
-
agent: agentOrProviderOptions,
|
|
128
|
-
providerOptions: providerOptionsOrTelemetry,
|
|
129
|
-
telemetry: telemetryArg,
|
|
130
|
-
};
|
|
131
|
-
}
|
|
132
|
-
return {
|
|
133
|
-
providerOptions: agentOrProviderOptions,
|
|
134
|
-
telemetry: providerOptionsOrTelemetry,
|
|
135
|
-
};
|
|
136
|
-
}
|
|
137
|
-
function isCompactionAgentInput(value) {
|
|
138
|
-
if (typeof value !== "object" || value === null) {
|
|
139
|
-
return false;
|
|
140
|
-
}
|
|
141
|
-
return "system" in value && "tools" in value;
|
|
142
|
-
}
|
|
143
|
-
function fitCompactedMessages(input) {
|
|
144
|
-
const rawCandidate = [input.summaryMessage, ...input.recent];
|
|
145
|
-
if (estimatePromptTokens({ agent: input.agent, messages: rawCandidate }) <= input.config.threshold) {
|
|
146
|
-
return rawCandidate;
|
|
147
|
-
}
|
|
148
|
-
for (let rawTailSize = input.recent.length - 1; rawTailSize >= 1; rawTailSize -= 1) {
|
|
149
|
-
const summarizedRecent = createRecentContextSummaryMessage(input.recent.slice(0, -rawTailSize));
|
|
150
|
-
const rawTail = input.recent.slice(-rawTailSize);
|
|
151
|
-
const candidate = [
|
|
152
|
-
input.summaryMessage,
|
|
153
|
-
...(summarizedRecent === null ? [] : [summarizedRecent]),
|
|
154
|
-
...rawTail,
|
|
155
|
-
];
|
|
156
|
-
if (estimatePromptTokens({
|
|
157
|
-
agent: input.agent,
|
|
158
|
-
messages: candidate,
|
|
159
|
-
}) <= input.config.threshold) {
|
|
160
|
-
return candidate;
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
const summarizedRecent = createRecentContextSummaryMessage(input.recent);
|
|
164
|
-
if (summarizedRecent === null) {
|
|
165
|
-
return [input.summaryMessage];
|
|
166
|
-
}
|
|
167
|
-
const summarizedCandidate = [input.summaryMessage, summarizedRecent];
|
|
168
|
-
if (estimatePromptTokens({
|
|
169
|
-
agent: input.agent,
|
|
170
|
-
messages: summarizedCandidate,
|
|
171
|
-
}) <= input.config.threshold) {
|
|
172
|
-
return summarizedCandidate;
|
|
173
|
-
}
|
|
174
|
-
return [input.summaryMessage];
|
|
175
|
-
}
|
|
176
|
-
function createCompactionCheckpointMessage(label, content) {
|
|
177
|
-
const summary = summarizeCheckpointText(content);
|
|
178
|
-
const text = summary.length === 0 ? `${label}: Conversation history was compacted.` : `${label}: ${summary}`;
|
|
179
|
-
return { content: text, role: "system" };
|
|
180
|
-
}
|
|
181
|
-
function createRecentContextSummaryMessage(messages) {
|
|
182
|
-
const sections = messages
|
|
183
|
-
.map((message) => ({
|
|
184
|
-
content: summarizeCompactionMessageContent(message),
|
|
185
|
-
role: message.role,
|
|
186
|
-
}))
|
|
187
|
-
.filter((message) => message.content.length > 0)
|
|
188
|
-
.map((message) => `### ${message.role}\n${message.content}`);
|
|
189
|
-
if (sections.length === 0) {
|
|
190
|
-
return null;
|
|
191
|
-
}
|
|
192
|
-
return createCompactionCheckpointMessage("Recent context", sections.join("\n\n"));
|
|
193
|
-
}
|
|
194
161
|
function summarizeCompactionMessageContent(message) {
|
|
195
162
|
if (typeof message.content === "string") {
|
|
196
163
|
return summarizeText(message.content);
|
|
@@ -201,17 +168,6 @@ function summarizeCompactionMessageContent(message) {
|
|
|
201
168
|
.join("\n")
|
|
202
169
|
.trim();
|
|
203
170
|
}
|
|
204
|
-
function serializeToolDefinitions(tools) {
|
|
205
|
-
const serialized = JSON.stringify(tools);
|
|
206
|
-
return serialized ?? "";
|
|
207
|
-
}
|
|
208
|
-
function serializeMessageContent(message) {
|
|
209
|
-
if (typeof message.content === "string") {
|
|
210
|
-
return message.content;
|
|
211
|
-
}
|
|
212
|
-
const serialized = JSON.stringify(message.content);
|
|
213
|
-
return serialized ?? "";
|
|
214
|
-
}
|
|
215
171
|
function summarizeCompactionContentPart(part) {
|
|
216
172
|
switch (part.type) {
|
|
217
173
|
case "text":
|
|
@@ -285,11 +241,4 @@ function summarizeText(value) {
|
|
|
285
241
|
}
|
|
286
242
|
return `${normalized.slice(0, COMPACTION_TEXT_LIMIT).trimEnd()}…`;
|
|
287
243
|
}
|
|
288
|
-
function summarizeCheckpointText(value) {
|
|
289
|
-
const normalized = value.replace(/\s+/g, " ").trim();
|
|
290
|
-
if (normalized.length <= COMPACTION_CHECKPOINT_TEXT_LIMIT) {
|
|
291
|
-
return normalized;
|
|
292
|
-
}
|
|
293
|
-
return `${normalized.slice(0, COMPACTION_CHECKPOINT_TEXT_LIMIT).trimEnd()}…`;
|
|
294
|
-
}
|
|
295
244
|
//# sourceMappingURL=compaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiE,MAAM,IAAI,CAAC;AAKjG,MAAM,wBAAwB,GAAG;IAC/B,oCAAoC;IACpC,6DAA6D;IAC7D,oHAAoH;IACpH,4CAA4C;IAC5C,mHAAmH;IACnH,0CAA0C;CAC3C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAYtC;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAiC;IAC9D,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,GAAG,4BAA4B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAiC,EACjC,MAAwB;IAExB,IAAI,MAAM,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,2BAA2B,CAAC;IAC9D,IACE,kBAAkB,KAAK,SAAS;QAChC,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;QACrC,kBAAkB,GAAG,CAAC;QACtB,kBAAkB,GAAG,QAAQ,CAAC,MAAM,EACpC,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC,oBAAoB,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,4BAA4B,CAAC,OAAqB;IACzD,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,yBAAyB,CAAC,IAA6B;IAC9D,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,KAAK,WAAW;YACd,OAAO,CAAC,CAAC;QACX,KAAK,WAAW;YACd,OAAO,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACtC,KAAK,aAAa;YAChB,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxC;YACE,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,IAI/B;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC;IACtC,OAAO,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,wBAAwB,CAAC,IAA4C;IAC5E,OAAO,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAc;IACnD,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa;IACzC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACzF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACxD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YAED,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;gBAC5B,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC;YACJ,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAiC,EACjC,MAAwB;IAExB,OAAO,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAK5C;IAIC,MAAM,SAAS,GAAG,KAAK,CAAC,wBAAwB,IAAI,KAAK,CAAC,cAAc,CAAC;IACzE,MAAM,KAAK,GACT,SAAS,KAAK,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAEzF,OAAO;QACL,KAAK;QACL,eAAe,EAAE,SAAS,CAAC,eAEJ;KACxB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAwB,EACxB,KAAoB,EACpB,MAAwB,EACxB,eAAuE,EACvE,SAA6B;IAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,WAAW,GAAkC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACzE,OAAO,EAAE,iCAAiC,CAAC,OAAO,CAAC;QACnD,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC,CAAC;IAEJ,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;QAChC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,SAAS;QAC9F,KAAK;QACL,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC;QAC3C,eAAe;QACf,MAAM,EAAE,wBAAwB;QAChC,WAAW,EAAE,CAAC;KACf,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,OAAO,EAAE,qBAAqB,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgD;IAC9E,MAAM,QAAQ,GAAG,QAAQ;SACtB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACtD,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,0BAA0B,EAAE,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,iCAAiC,CAAC,OAAqB;IAC9D,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO;SACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;SACnD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;SACvC,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,8BAA8B,CAAC,IAA6B;IACnE,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,KAAK,WAAW;YACd,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,QAAQ;gBAClB,CAAC,CAAC,iBAAiB,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,SAAS,GAAG;gBACtD,CAAC,CAAC,6BAA6B,IAAI,CAAC,SAAS,GAAG,CAAC;QACrD,KAAK,WAAW;YACd,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACrC,KAAK,aAAa;YAChB,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACvC;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,IAA2C;IACxE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,OAAO,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,QAAQ,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;AACrF,CAAC;AAED,SAAS,uBAAuB,CAAC,IAIhC;IACC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;IACrD,OAAO,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,IAAI,MAAM,EAAE,CAAC;AAClG,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc,EAAE,KAAK,GAAG,CAAC;IACtD,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAClC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACzF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,OAAO,SAAS,KAAK,CAAC,MAAM,GAAG,CAAC;QAClC,CAAC;QAED,MAAM,OAAO,GAAG,KAAK;aAClB,KAAK,CAAC,CAAC,EAAE,2BAA2B,CAAC;aACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,2BAA2B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,OAAO,SAAS,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC;IAClE,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,CAAC;QACjE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,OAAO,UAAU,OAAO,CAAC,MAAM,QAAQ,CAAC;QAC1C,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO;aACrB,KAAK,CAAC,CAAC,EAAE,2BAA2B,CAAC;aACrC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,2BAA2B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,UAAU,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC;IACnD,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,IAAI,UAAU,CAAC,MAAM,IAAI,qBAAqB,EAAE,CAAC;QAC/C,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC;AACpE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { LanguageModel, PrepareStepFunction, StepResult, TelemetrySettings, ToolSet } from "ai";
|
|
1
|
+
import type { LanguageModel, ModelMessage, PrepareStepFunction, StepResult, TelemetrySettings, ToolSet } from "ai";
|
|
2
2
|
import type { HarnessEmissionState } from "./emission.js";
|
|
3
3
|
import { type AnthropicCacheMarker, type PromptCachePath } from "./prompt-cache.js";
|
|
4
4
|
import type { HarnessEmitFn, HarnessSession, ToolLoopHarnessConfig } from "./types.js";
|
|
@@ -27,16 +27,17 @@ export interface StepHooksInput {
|
|
|
27
27
|
* Composable hooks returned by {@link buildStepHooks}.
|
|
28
28
|
*/
|
|
29
29
|
export interface StepHooks {
|
|
30
|
+
/**
|
|
31
|
+
* Returns the exact prompt projection most recently produced by
|
|
32
|
+
* `prepareStep()`. Includes compaction output and any tool-owned
|
|
33
|
+
* compaction messages appended afterward.
|
|
34
|
+
*/
|
|
35
|
+
readonly getPreparedMessages: () => readonly ModelMessage[] | undefined;
|
|
30
36
|
/**
|
|
31
37
|
* Returns the session, which may have been updated by compaction inside
|
|
32
38
|
* `prepareStep`. Call after the agent finishes.
|
|
33
39
|
*/
|
|
34
40
|
readonly getSession: () => HarnessSession;
|
|
35
|
-
/**
|
|
36
|
-
* Returns the heuristic estimate for the prompt prepared for the current
|
|
37
|
-
* step, after compaction injections have been applied.
|
|
38
|
-
*/
|
|
39
|
-
readonly getInputTokenEstimate: () => number | undefined;
|
|
40
41
|
/**
|
|
41
42
|
* `ToolLoopAgent` `onStepFinish` callback.
|
|
42
43
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-hooks.d.ts","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEb,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,OAAO,EAGR,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"step-hooks.d.ts","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEb,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,OAAO,EAGR,MAAM,IAAI,CAAC;AAeZ,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EACL,KAAK,oBAAoB,EAGzB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMvF;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,UAAU,CAAC,OAAO,CAAC,EACnB,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,OAAO,CACzF,CAAC;AAMF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC9D,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,EAAE,MAAM,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;IAExE;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,cAAc,CAAC;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;;;OAQG;IACH,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEnD;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACjD;AAMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,CA6G/D;AAMD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACvD,GACA,OAAO,CAAC,IAAI,CAAC,CA8Df"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createActionResultEvent, createActionsRequestedEvent, createCompactionCompletedEvent, createCompactionRequestedEvent, createStepCompletedEvent, } from "../protocol/message.js";
|
|
2
|
-
import { compactMessages,
|
|
2
|
+
import { compactMessages, getInputTokenCount, resolveCompactionModel, shouldCompact, } from "./compaction.js";
|
|
3
3
|
import { emitStepStarted, normalizeAssistantStepFinishReason } from "./emission.js";
|
|
4
4
|
import { extractToolApprovalInputRequests } from "./input-extraction.js";
|
|
5
5
|
import { applyConversationCacheControl, mergeGatewayAutoCaching, } from "./prompt-cache.js";
|
|
@@ -15,8 +15,8 @@ import { applyConversationCacheControl, mergeGatewayAutoCaching, } from "./promp
|
|
|
15
15
|
*/
|
|
16
16
|
export function buildStepHooks(input) {
|
|
17
17
|
let session = input.session;
|
|
18
|
+
let preparedMessages;
|
|
18
19
|
const emit = input.emit;
|
|
19
|
-
let inputTokenEstimate;
|
|
20
20
|
let resolveStep;
|
|
21
21
|
const stepResult = new Promise((resolve) => {
|
|
22
22
|
resolveStep = resolve;
|
|
@@ -31,7 +31,7 @@ export function buildStepHooks(input) {
|
|
|
31
31
|
await emitStepStarted(emit, input.emissionState);
|
|
32
32
|
}
|
|
33
33
|
// 2. Compaction
|
|
34
|
-
if (shouldCompact(
|
|
34
|
+
if (shouldCompact(processed, session.compaction)) {
|
|
35
35
|
const compaction = await resolveCompactionModel({
|
|
36
36
|
compactionModelReference: session.agent.compactionModelReference,
|
|
37
37
|
model: input.model,
|
|
@@ -45,14 +45,10 @@ export function buildStepHooks(input) {
|
|
|
45
45
|
sessionId: session.sessionId,
|
|
46
46
|
thresholdPercent: 0,
|
|
47
47
|
turnId: input.emissionState.turnId,
|
|
48
|
-
usageInputTokens: getInputTokenCount(
|
|
49
|
-
agent: session.agent,
|
|
50
|
-
compaction: session.compaction,
|
|
51
|
-
messages: processed,
|
|
52
|
-
}),
|
|
48
|
+
usageInputTokens: getInputTokenCount(processed, session.compaction),
|
|
53
49
|
}));
|
|
54
50
|
}
|
|
55
|
-
processed = await compactMessages(processed, compaction.model, session.compaction,
|
|
51
|
+
processed = await compactMessages(processed, compaction.model, session.compaction, compaction.providerOptions, input.telemetry);
|
|
56
52
|
if (input.onCompaction) {
|
|
57
53
|
const compacted = await input.onCompaction(session);
|
|
58
54
|
session = compacted.session;
|
|
@@ -70,14 +66,11 @@ export function buildStepHooks(input) {
|
|
|
70
66
|
}));
|
|
71
67
|
}
|
|
72
68
|
}
|
|
73
|
-
inputTokenEstimate = estimatePromptTokens({
|
|
74
|
-
agent: session.agent,
|
|
75
|
-
messages: processed,
|
|
76
|
-
});
|
|
77
69
|
// 3. Anthropic message cache markers
|
|
78
70
|
if (input.cachePath.kind === "anthropic-direct" && input.marker) {
|
|
79
71
|
processed = applyConversationCacheControl(processed, input.marker);
|
|
80
72
|
}
|
|
73
|
+
preparedMessages = [...processed];
|
|
81
74
|
// 4. Gateway provider options
|
|
82
75
|
const stepResult = {
|
|
83
76
|
messages: processed,
|
|
@@ -94,7 +87,7 @@ export function buildStepHooks(input) {
|
|
|
94
87
|
resolveStep(step);
|
|
95
88
|
};
|
|
96
89
|
return {
|
|
97
|
-
|
|
90
|
+
getPreparedMessages: () => preparedMessages,
|
|
98
91
|
getSession: () => session,
|
|
99
92
|
onStepFinish,
|
|
100
93
|
prepareStep,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-hooks.js","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"step-hooks.js","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAoHpB,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAgL3E"}
|
|
@@ -217,14 +217,13 @@ export function createToolLoopHarness(config) {
|
|
|
217
217
|
throw error;
|
|
218
218
|
}
|
|
219
219
|
session = hooks.getSession();
|
|
220
|
-
const
|
|
220
|
+
const preparedMessages = hooks.getPreparedMessages() ?? messages;
|
|
221
221
|
// --- Handle result ------------------------------------------------------
|
|
222
222
|
return handleStepResult({
|
|
223
223
|
config,
|
|
224
224
|
emit,
|
|
225
225
|
emissionState,
|
|
226
|
-
|
|
227
|
-
inputTokenEstimate,
|
|
226
|
+
promptMessages: preparedMessages,
|
|
228
227
|
result,
|
|
229
228
|
runStep,
|
|
230
229
|
session,
|
|
@@ -240,7 +239,7 @@ export function createToolLoopHarness(config) {
|
|
|
240
239
|
* park, continue the tool loop, or terminate.
|
|
241
240
|
*/
|
|
242
241
|
async function handleStepResult(input) {
|
|
243
|
-
const { config, emit,
|
|
242
|
+
const { config, emit, promptMessages, result, runStep } = input;
|
|
244
243
|
let { emissionState, session } = input;
|
|
245
244
|
const responseMessages = result.response.messages;
|
|
246
245
|
const stepOutput = resolveAssistantStepText(responseMessages, result.text);
|
|
@@ -251,26 +250,16 @@ async function handleStepResult(input) {
|
|
|
251
250
|
excludedCallIds: approvalRequestCallIds,
|
|
252
251
|
});
|
|
253
252
|
const inputRequests = [...approvalRequests, ...questionRequests];
|
|
254
|
-
const compaction = {
|
|
255
|
-
recentWindowSize: session.compaction.recentWindowSize,
|
|
256
|
-
threshold: session.compaction.threshold,
|
|
257
|
-
};
|
|
258
|
-
if (inputTokenEstimate !== undefined) {
|
|
259
|
-
compaction.lastEstimatedInputTokens = inputTokenEstimate;
|
|
260
|
-
}
|
|
261
|
-
if (result.usage?.inputTokens !== undefined) {
|
|
262
|
-
compaction.lastKnownInputTokens = result.usage.inputTokens;
|
|
263
|
-
}
|
|
264
253
|
const baseSession = {
|
|
265
254
|
...session,
|
|
266
|
-
compaction,
|
|
255
|
+
compaction: createNextCompactionConfig(session.compaction, promptMessages, result),
|
|
267
256
|
};
|
|
268
257
|
// --- Park on input requests -----------------------------------------------
|
|
269
258
|
if (inputRequests.length > 0) {
|
|
270
259
|
let parkedSession = setPendingInputBatch({
|
|
271
260
|
requests: inputRequests,
|
|
272
261
|
responseMessages,
|
|
273
|
-
session: { ...baseSession, history:
|
|
262
|
+
session: { ...baseSession, history: [...promptMessages] },
|
|
274
263
|
});
|
|
275
264
|
if (emit) {
|
|
276
265
|
await emit(createInputRequestedEvent({
|
|
@@ -287,7 +276,7 @@ async function handleStepResult(input) {
|
|
|
287
276
|
return { next: null, session: parkedSession };
|
|
288
277
|
}
|
|
289
278
|
// --- Continue or terminate ------------------------------------------------
|
|
290
|
-
const updatedHistory = [...
|
|
279
|
+
const updatedHistory = [...promptMessages, ...responseMessages];
|
|
291
280
|
let nextSession = { ...baseSession, history: updatedHistory };
|
|
292
281
|
const continueLoop = responseMessages.at(-1)?.role === "tool" || hasDeferredStepInput(nextSession);
|
|
293
282
|
if (emit) {
|
|
@@ -307,6 +296,17 @@ async function handleStepResult(input) {
|
|
|
307
296
|
session: nextSession,
|
|
308
297
|
};
|
|
309
298
|
}
|
|
299
|
+
function createNextCompactionConfig(current, promptMessages, result) {
|
|
300
|
+
const next = {
|
|
301
|
+
recentWindowSize: current.recentWindowSize,
|
|
302
|
+
threshold: current.threshold,
|
|
303
|
+
};
|
|
304
|
+
if (result.usage?.inputTokens !== undefined) {
|
|
305
|
+
next.lastKnownInputTokens = result.usage.inputTokens;
|
|
306
|
+
next.lastKnownPromptMessageCount = promptMessages.length;
|
|
307
|
+
}
|
|
308
|
+
return next;
|
|
309
|
+
}
|
|
310
310
|
/**
|
|
311
311
|
* Creates an approval-key resolver from the tool map. The resolver computes
|
|
312
312
|
* compound keys at recording time instead of pre-computing and persisting
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAA+B,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAqB,WAAW,EAA0B,aAAa,EAAE,MAAM,IAAI,CAAC;AAE3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAGpF,OAAO,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,4BAA4B,EAC5B,gCAAgC,GACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,eAAe,EAA0B,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAA+B,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAqB,WAAW,EAA0B,aAAa,EAAE,MAAM,IAAI,CAAC;AAE3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAGpF,OAAO,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,4BAA4B,EAC5B,gCAAgC,GACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,eAAe,EAA0B,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAW3D;;;;;;;;;;;;;GAaG;AAEH;;;;GAIG;AACH,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;AAEtD,SAAS,eAAe,CACtB,QAA4C,EAC5C,MAAsD,EACtD,OAAuB,EACvB,SAA6B;IAE7B,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,QAAQ;QACX,MAAM;QACN,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,SAAS;QAC5C,QAAQ,EAAE;YACR,GAAI,QAAQ,CAAC,QAA+C;YAC5D,iBAAiB,EAAE,WAAW;YAC9B,gBAAgB,EAAE,OAAO,CAAC,SAAS;YACnC,wBAAwB,EAAE,OAAO,CAAC,iBAAiB;SACpD;KACF,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,gEAAgE;AAChE,8EAA8E;AAE9E,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAYrD,SAAS,iBAAiB,CAAC,OAE1B;IACC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAA+B,CAAC;AAC7E,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAuB,EAAE,WAAwB;IAC1E,MAAM,MAAM,GAAmB;QAC7B,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC;IAEF,OAAO;QACL,GAAG,OAAO;QACV,KAAK,EAAE;YACL,GAAG,OAAO,CAAC,KAAK;YAChB,CAAC,oBAAoB,CAAC,EAAE,MAAM;SAC/B;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAC7B,MAAsD,EACtD,QAA0B,EAC1B,OAA+D;IAE/D,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC;gBACnC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;YACH,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAA6B;IACjE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC;IACzC,MAAM,MAAM,GAAG,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;IAEpD,KAAK,UAAU,OAAO,CACpB,cAA+C,EAC/C,KAAiB;QAEjB,2EAA2E;QAE3E,mEAAmE;QACnE,oEAAoE;QACpE,IAAI,QAA0B,CAAC;QAC/B,IAAI,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,eAAe,EAAE,UAAU,IAAI,SAAS,CAAC;YAC5D,MAAM,UAAU,GAA2B;gBACzC,iBAAiB,EAAE,WAAW;gBAC9B,gBAAgB,EAAE,cAAc,CAAC,SAAS;gBAC1C,wBAAwB,EAAE,cAAc,CAAC,iBAAiB;aAC3D,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,yBAAyB,CAAC,GAAG,UAAU,CAAC;YACrD,CAAC;YACD,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,kEAAkE;QAClE,iDAAiD;QACjD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC/E,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAE3E,IAAI,CAAC;YACH,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,MAAM,WAAW,EAAE,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,QAAQ,EAAE,GAAG,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IAED,KAAK,UAAU,eAAe,CAC5B,cAA+C,EAC/C,KAAiB,EACjB,QAAe;QAEf,IAAI,OAAO,GAAG,cAAc,CAAC;QAE7B,mEAAmE;QACnE,uDAAuD;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,GAAG,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,aAAa,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAErD,2EAA2E;QAE3E,MAAM,SAAS,GAAG,wBAAwB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/D,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAE5B,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,kBAAkB,EAAE,2BAA2B,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7D,OAAO;YACP,SAAS,EAAE,SAAS,CAAC,KAAK;SAC3B,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;QAED,2EAA2E;QAE3E,IAAI,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,aAAa,GAAG,MAAM,gBAAgB,CACpC,IAAI,EACJ,KAAK,IAAI,EAAE,EACX,aAAa,EACb,MAAM,CAAC,eAAe,CACvB,CAAC;YACF,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAE1D,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC1B,MAAM,QAAQ,GAAmB,OAAO,CAAC,QAAQ,CAAC;QAElD,IAAI,SAAS,CAAC,KAAK,EAAE,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YACvE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,2EAA2E;QAE3E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7F,MAAM,KAAK,GAAG,MAAM,6BAA6B,CAAC;YAChD,aAAa,EAAE,gBAAgB,CAAC,OAAO,CAAC;YACxC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;YAC5B,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc;YAC5C,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEpF,2EAA2E;QAE3E,MAAM,KAAK,GAAG,cAAc,CAAC;YAC3B,SAAS;YACT,IAAI;YACJ,aAAa;YACb,MAAM;YACN,KAAK;YACL,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO;YACP,SAAS,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,IAAI,SAAS;SACrF,CAAC,CAAC;QAEH,2EAA2E;QAE3E,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC;YAC9B,sBAAsB,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC;YACpF,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS;YAC/C,KAAK;YACL,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;YACxB,KAAK,EAAE,cAAc;SACtB,CAAC,CAAC;QAEH,IAAI,MAAyB,CAAC;QAC9B,IAAI,CAAC;YACH,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACtD,MAAM,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBACtE,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;gBAChC,MAAM,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE;oBACjD,uBAAuB,EAAE,IAAI,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAAC;iBAC3D,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACnC,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;YAClC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE;oBACxC,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC/D,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC7B,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAG,KAAK,CAAC,mBAAmB,EAAE,IAAI,QAAQ,CAAC;QAEjE,2EAA2E;QAE3E,OAAO,gBAAgB,CAAC;YACtB,MAAM;YACN,IAAI;YACJ,aAAa;YACb,cAAc,EAAE,gBAAgB;YAChC,MAAM;YACN,OAAO;YACP,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,8EAA8E;AAC9E,4BAA4B;AAC5B,8EAA8E;AAE9E;;;GAGG;AACH,KAAK,UAAU,gBAAgB,CAAC,KAQ/B;IACC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEvC,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAClD,MAAM,UAAU,GAAG,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,gBAAgB,GAAG,gCAAgC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7F,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,MAAM,gBAAgB,GAAG,4BAA4B,CAAC;QACpD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,eAAe,EAAE,sBAAsB;KACxC,CAAC,CAAC;IACH,MAAM,aAAa,GAAmB,CAAC,GAAG,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAEjF,MAAM,WAAW,GAAmB;QAClC,GAAG,OAAO;QACV,UAAU,EAAE,0BAA0B,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC;KACnF,CAAC;IAEF,6EAA6E;IAE7E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,IAAI,aAAa,GAAG,oBAAoB,CAAC;YACvC,QAAQ,EAAE,aAAa;YACvB,gBAAgB;YAChB,OAAO,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,EAAE;SAC1D,CAAC,CAAC;QAEH,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,IAAI,CACR,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,aAAa;gBACvB,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;aAC7B,CAAC,CACH,CAAC;YAEF,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACzE,aAAa,GAAG,uBAAuB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;IAChD,CAAC;IAED,6EAA6E;IAE7E,MAAM,cAAc,GAAmB,CAAC,GAAG,cAAc,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAChF,IAAI,WAAW,GAAmB,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAE9E,MAAM,YAAY,GAChB,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAEhF,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC;QACD,WAAW,GAAG,uBAAuB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACjD,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9E,OAAO,EAAE,WAAW;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAyB,EACzB,cAAuC,EACvC,MAAyB;IAEzB,MAAM,IAAI,GAKN;QACF,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC;IAEF,IAAI,MAAM,CAAC,KAAK,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5C,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;QACrD,IAAI,CAAC,2BAA2B,GAAG,cAAc,CAAC,MAAM,CAAC;IAC3D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAS,2BAA2B,CAClC,KAAqB;IAErB,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -22,14 +22,8 @@ export interface SessionToolDefinition {
|
|
|
22
22
|
* Compaction configuration stored on the session.
|
|
23
23
|
*/
|
|
24
24
|
export interface CompactionConfig {
|
|
25
|
-
/**
|
|
26
|
-
* Heuristic estimate of the prompt size for the last prepared step.
|
|
27
|
-
*
|
|
28
|
-
* Stored alongside the exact usage sample so the next step can project
|
|
29
|
-
* current prompt growth before making the model call.
|
|
30
|
-
*/
|
|
31
|
-
readonly lastEstimatedInputTokens?: number;
|
|
32
25
|
readonly lastKnownInputTokens?: number;
|
|
26
|
+
readonly lastKnownPromptMessageCount?: number;
|
|
33
27
|
readonly recentWindowSize: number;
|
|
34
28
|
readonly threshold: number;
|
|
35
29
|
}
|
|
@@ -67,8 +61,8 @@ export interface HarnessSession {
|
|
|
67
61
|
* Result returned by the compaction callback.
|
|
68
62
|
*
|
|
69
63
|
* `session` carries any state resets (e.g. clearing active skills).
|
|
70
|
-
* `messages` carries context to
|
|
71
|
-
* todo list as a user message).
|
|
64
|
+
* `messages` carries context to append to the compacted history
|
|
65
|
+
* (e.g. the current todo list as a user message).
|
|
72
66
|
*/
|
|
73
67
|
export interface CompactionCallbackResult {
|
|
74
68
|
readonly messages: readonly ModelMessage[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/harness/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/harness/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { ASH_PACKAGE_NAME } from "../../package-name.js";
|
|
|
6
6
|
let cachedPackageInfo;
|
|
7
7
|
// The package build stamps the published version into `dist` so bundled
|
|
8
8
|
// deployments can still report package metadata without resolving package.json.
|
|
9
|
-
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.2.0-alpha.
|
|
9
|
+
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.2.0-alpha.30";
|
|
10
10
|
const BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER = "__ASH_PACKAGE_VERSION_PLACEHOLDER__";
|
|
11
11
|
function resolveFallbackPackageVersion() {
|
|
12
12
|
return BUNDLED_FALLBACK_PACKAGE_VERSION === BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER
|