experimental-ash 0.2.0-alpha.30 → 0.2.0-alpha.32
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/harness/compaction.d.ts.map +1 -1
- package/dist/src/harness/compaction.js +68 -17
- package/dist/src/harness/compaction.js.map +1 -1
- package/dist/src/harness/tool-loop.d.ts.map +1 -1
- package/dist/src/harness/tool-loop.js +8 -3
- package/dist/src/harness/tool-loop.js.map +1 -1
- package/dist/src/harness/tool-result-history.d.ts +11 -0
- package/dist/src/harness/tool-result-history.d.ts.map +1 -0
- package/dist/src/harness/tool-result-history.js +338 -0
- package/dist/src/harness/tool-result-history.js.map +1 -0
- package/dist/src/internal/application/package.js +1 -1
- package/package.json +1 -1
|
@@ -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,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;
|
|
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;AAyB1E;;;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;AAiGD;;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,CAoCzB"}
|
|
@@ -7,6 +7,7 @@ const COMPACTION_SYSTEM_PROMPT = [
|
|
|
7
7
|
"Prefer short labeled sections such as Goal, Instructions, Discoveries, Accomplished, and Next steps when helpful.",
|
|
8
8
|
"Do not answer questions or invent facts.",
|
|
9
9
|
].join(" ");
|
|
10
|
+
const COMPACTION_SUMMARY_RESERVE_TOKENS = 2_048;
|
|
10
11
|
const COMPACTION_TEXT_LIMIT = 280;
|
|
11
12
|
const COMPACTION_COLLECTION_LIMIT = 3;
|
|
12
13
|
/**
|
|
@@ -67,11 +68,14 @@ function estimateToolResultTokens(part) {
|
|
|
67
68
|
}
|
|
68
69
|
function estimateSerializedValueTokens(value) {
|
|
69
70
|
const serialized = serializeEstimateValue(value);
|
|
70
|
-
return serialized.length === 0 ? 0 :
|
|
71
|
+
return serialized.length === 0 ? 0 : estimateStructuredStringTokens(serialized);
|
|
71
72
|
}
|
|
72
73
|
function estimateStringTokens(value) {
|
|
73
74
|
return value.length / 4;
|
|
74
75
|
}
|
|
76
|
+
function estimateStructuredStringTokens(value) {
|
|
77
|
+
return value.length / 2;
|
|
78
|
+
}
|
|
75
79
|
function serializeEstimateValue(value) {
|
|
76
80
|
if (value === undefined) {
|
|
77
81
|
return "";
|
|
@@ -132,22 +136,69 @@ export async function resolveCompactionModel(input) {
|
|
|
132
136
|
* recent messages.
|
|
133
137
|
*/
|
|
134
138
|
export async function compactMessages(messages, model, config, providerOptions, telemetry) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
139
|
+
let keep = selectRecentWindowSize(messages, config);
|
|
140
|
+
while (true) {
|
|
141
|
+
const { older, recent } = splitMessagesForCompaction(messages, keep);
|
|
142
|
+
if (older.length === 0) {
|
|
143
|
+
return recent;
|
|
144
|
+
}
|
|
145
|
+
const prunedOlder = older.map((message) => ({
|
|
146
|
+
content: summarizeCompactionMessageContent(message),
|
|
147
|
+
role: message.role,
|
|
148
|
+
}));
|
|
149
|
+
const result = await generateText({
|
|
150
|
+
experimental_telemetry: telemetry
|
|
151
|
+
? { ...telemetry, functionId: "ash.compaction" }
|
|
152
|
+
: undefined,
|
|
153
|
+
model,
|
|
154
|
+
prompt: formatCompactionPrompt(prunedOlder),
|
|
155
|
+
providerOptions,
|
|
156
|
+
system: COMPACTION_SYSTEM_PROMPT,
|
|
157
|
+
temperature: 0,
|
|
158
|
+
});
|
|
159
|
+
const compacted = [
|
|
160
|
+
{ content: `Previous context: ${result.text}`, role: "system" },
|
|
161
|
+
...recent,
|
|
162
|
+
];
|
|
163
|
+
if (estimateTokens(compacted) <= config.threshold || keep === 0) {
|
|
164
|
+
return compacted;
|
|
165
|
+
}
|
|
166
|
+
keep -= 1;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
function selectRecentWindowSize(messages, config) {
|
|
170
|
+
const maxKeep = Math.min(config.recentWindowSize, Math.max(messages.length - 1, 0));
|
|
171
|
+
const reserve = resolveCompactionSummaryReserve(config);
|
|
172
|
+
let keep = 0;
|
|
173
|
+
let recentTokens = 0;
|
|
174
|
+
for (let index = messages.length - 1; index >= 0 && keep < maxKeep; index -= 1) {
|
|
175
|
+
const message = messages[index];
|
|
176
|
+
if (message === undefined) {
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
const messageTokens = estimateTokens([message]);
|
|
180
|
+
if (recentTokens + messageTokens + reserve > config.threshold) {
|
|
181
|
+
break;
|
|
182
|
+
}
|
|
183
|
+
recentTokens += messageTokens;
|
|
184
|
+
keep += 1;
|
|
185
|
+
}
|
|
186
|
+
return keep;
|
|
187
|
+
}
|
|
188
|
+
function resolveCompactionSummaryReserve(config) {
|
|
189
|
+
return Math.min(COMPACTION_SUMMARY_RESERVE_TOKENS, Math.max(64, Math.floor(config.threshold / 4)));
|
|
190
|
+
}
|
|
191
|
+
function splitMessagesForCompaction(messages, keep) {
|
|
192
|
+
if (keep <= 0) {
|
|
193
|
+
return {
|
|
194
|
+
older: [...messages],
|
|
195
|
+
recent: [],
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
return {
|
|
199
|
+
older: messages.slice(0, -keep),
|
|
200
|
+
recent: messages.slice(-keep),
|
|
201
|
+
};
|
|
151
202
|
}
|
|
152
203
|
function formatCompactionPrompt(messages) {
|
|
153
204
|
const sections = messages
|
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAoHpB,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAgL3E"}
|
|
@@ -8,6 +8,7 @@ import { consumeDeferredStepInput, getApprovedTools, hasDeferredStepInput, hasSt
|
|
|
8
8
|
import { resolveAssistantStepText } from "./messages.js";
|
|
9
9
|
import { applyLastToolCacheBreakpoint, detectPromptCachePath, getAnthropicCacheMarker, } from "./prompt-cache.js";
|
|
10
10
|
import { buildStepHooks, emitStepActions } from "./step-hooks.js";
|
|
11
|
+
import { normalizeResponseMessagesForHistory } from "./tool-result-history.js";
|
|
11
12
|
import { buildToolSetWithProviderTools } from "./tools.js";
|
|
12
13
|
/**
|
|
13
14
|
* Creates a tool-loop harness step function backed by AI SDK `ToolLoopAgent`.
|
|
@@ -254,11 +255,12 @@ async function handleStepResult(input) {
|
|
|
254
255
|
...session,
|
|
255
256
|
compaction: createNextCompactionConfig(session.compaction, promptMessages, result),
|
|
256
257
|
};
|
|
258
|
+
const historyResponseMessages = normalizeResponseMessagesForHistory(responseMessages, resolveHistoryToolResultTokenLimit(baseSession.compaction));
|
|
257
259
|
// --- Park on input requests -----------------------------------------------
|
|
258
260
|
if (inputRequests.length > 0) {
|
|
259
261
|
let parkedSession = setPendingInputBatch({
|
|
260
262
|
requests: inputRequests,
|
|
261
|
-
responseMessages,
|
|
263
|
+
responseMessages: historyResponseMessages,
|
|
262
264
|
session: { ...baseSession, history: [...promptMessages] },
|
|
263
265
|
});
|
|
264
266
|
if (emit) {
|
|
@@ -276,9 +278,9 @@ async function handleStepResult(input) {
|
|
|
276
278
|
return { next: null, session: parkedSession };
|
|
277
279
|
}
|
|
278
280
|
// --- Continue or terminate ------------------------------------------------
|
|
279
|
-
const updatedHistory = [...promptMessages, ...
|
|
281
|
+
const updatedHistory = [...promptMessages, ...historyResponseMessages];
|
|
280
282
|
let nextSession = { ...baseSession, history: updatedHistory };
|
|
281
|
-
const continueLoop =
|
|
283
|
+
const continueLoop = historyResponseMessages.at(-1)?.role === "tool" || hasDeferredStepInput(nextSession);
|
|
282
284
|
if (emit) {
|
|
283
285
|
if (!continueLoop) {
|
|
284
286
|
emissionState = await emitTurnEpilogue(emit, emissionState, config.mode);
|
|
@@ -296,6 +298,9 @@ async function handleStepResult(input) {
|
|
|
296
298
|
session: nextSession,
|
|
297
299
|
};
|
|
298
300
|
}
|
|
301
|
+
function resolveHistoryToolResultTokenLimit(config) {
|
|
302
|
+
return Math.max(256, Math.min(16_000, Math.floor(config.threshold / 8)));
|
|
303
|
+
}
|
|
299
304
|
function createNextCompactionConfig(current, promptMessages, result) {
|
|
300
305
|
const next = {
|
|
301
306
|
recentWindowSize: current.recentWindowSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ModelMessage } from "ai";
|
|
2
|
+
/**
|
|
3
|
+
* Rewrites oversized tool-result payloads before they are persisted into
|
|
4
|
+
* durable session history.
|
|
5
|
+
*
|
|
6
|
+
* This keeps prompt history bounded between turns even when a tool returns a
|
|
7
|
+
* very large payload (for example a SQL result set). Small results are left
|
|
8
|
+
* unchanged.
|
|
9
|
+
*/
|
|
10
|
+
export declare function normalizeResponseMessagesForHistory(messages: readonly ModelMessage[], maxToolResultTokens?: number): ModelMessage[];
|
|
11
|
+
//# sourceMappingURL=tool-result-history.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-result-history.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-result-history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAYvC;;;;;;;GAOG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,mBAAmB,SAAyC,GAC3D,YAAY,EAAE,CAIhB"}
|
|
@@ -0,0 +1,338 @@
|
|
|
1
|
+
const DEFAULT_MAX_TOOL_RESULT_HISTORY_TOKENS = 16_000;
|
|
2
|
+
const HISTORY_PREVIEW_MARKER = "_ashHistoryPreview";
|
|
3
|
+
const MAX_PREVIEW_ARRAY_ITEMS = 8;
|
|
4
|
+
const MAX_PREVIEW_OBJECT_KEYS = 12;
|
|
5
|
+
const MAX_PREVIEW_STRING_CHARS = 2_000;
|
|
6
|
+
const MAX_TABLE_PREVIEW_COLUMNS = 24;
|
|
7
|
+
const MAX_TABLE_PREVIEW_ROWS = 20;
|
|
8
|
+
/**
|
|
9
|
+
* Rewrites oversized tool-result payloads before they are persisted into
|
|
10
|
+
* durable session history.
|
|
11
|
+
*
|
|
12
|
+
* This keeps prompt history bounded between turns even when a tool returns a
|
|
13
|
+
* very large payload (for example a SQL result set). Small results are left
|
|
14
|
+
* unchanged.
|
|
15
|
+
*/
|
|
16
|
+
export function normalizeResponseMessagesForHistory(messages, maxToolResultTokens = DEFAULT_MAX_TOOL_RESULT_HISTORY_TOKENS) {
|
|
17
|
+
return messages.map((message) => normalizeResponseMessageForHistory(message, maxToolResultTokens));
|
|
18
|
+
}
|
|
19
|
+
function normalizeResponseMessageForHistory(message, maxToolResultTokens) {
|
|
20
|
+
if (!Array.isArray(message.content)) {
|
|
21
|
+
return message;
|
|
22
|
+
}
|
|
23
|
+
let mutated = false;
|
|
24
|
+
const content = message.content.map((part) => {
|
|
25
|
+
const next = normalizeContentPartForHistory(part, maxToolResultTokens);
|
|
26
|
+
if (next !== part) {
|
|
27
|
+
mutated = true;
|
|
28
|
+
}
|
|
29
|
+
return next;
|
|
30
|
+
});
|
|
31
|
+
if (!mutated) {
|
|
32
|
+
return message;
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
...message,
|
|
36
|
+
content: content,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
function normalizeContentPartForHistory(part, maxToolResultTokens) {
|
|
40
|
+
if (part.type !== "tool-result") {
|
|
41
|
+
return part;
|
|
42
|
+
}
|
|
43
|
+
const output = normalizeToolResultOutputForHistory(part.output, maxToolResultTokens);
|
|
44
|
+
if (output === part.output) {
|
|
45
|
+
return part;
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
...part,
|
|
49
|
+
output: output,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
function normalizeToolResultOutputForHistory(output, maxToolResultTokens) {
|
|
53
|
+
if (output === undefined || isHistoryPreview(output)) {
|
|
54
|
+
return output;
|
|
55
|
+
}
|
|
56
|
+
const jsonWrappedOutput = unwrapJsonToolResultOutput(output);
|
|
57
|
+
if (jsonWrappedOutput !== undefined) {
|
|
58
|
+
const normalizedValue = normalizeToolResultOutputForHistory(jsonWrappedOutput.value, maxToolResultTokens);
|
|
59
|
+
if (normalizedValue === jsonWrappedOutput.value) {
|
|
60
|
+
return output;
|
|
61
|
+
}
|
|
62
|
+
return {
|
|
63
|
+
...jsonWrappedOutput.wrapper,
|
|
64
|
+
value: normalizedValue,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
if (estimateStructuredTokens(output) <= maxToolResultTokens) {
|
|
68
|
+
return output;
|
|
69
|
+
}
|
|
70
|
+
if (isTabularOutput(output)) {
|
|
71
|
+
return buildTabularPreview(output, maxToolResultTokens);
|
|
72
|
+
}
|
|
73
|
+
const preview = buildStructuredPreview(output, 0);
|
|
74
|
+
if (estimateStructuredTokens(preview) <= maxToolResultTokens) {
|
|
75
|
+
return preview;
|
|
76
|
+
}
|
|
77
|
+
return buildMinimalPreview(output);
|
|
78
|
+
}
|
|
79
|
+
function buildTabularPreview(output, maxToolResultTokens) {
|
|
80
|
+
let rowLimit = Math.min(output.rows.length, MAX_TABLE_PREVIEW_ROWS);
|
|
81
|
+
while (rowLimit > 0) {
|
|
82
|
+
const preview = buildTabularPreviewWithRowLimit(output, rowLimit);
|
|
83
|
+
if (estimateStructuredTokens(preview) <= maxToolResultTokens) {
|
|
84
|
+
return preview;
|
|
85
|
+
}
|
|
86
|
+
rowLimit = Math.floor(rowLimit / 2);
|
|
87
|
+
}
|
|
88
|
+
return buildMinimalTabularPreview(output);
|
|
89
|
+
}
|
|
90
|
+
function buildTabularPreviewWithRowLimit(output, rowLimit) {
|
|
91
|
+
const preview = {
|
|
92
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
93
|
+
rowCount: output.rows.length,
|
|
94
|
+
rows: output.rows.slice(0, rowLimit).map((row) => buildStructuredPreview(row, 1)),
|
|
95
|
+
truncated: true,
|
|
96
|
+
};
|
|
97
|
+
if (Array.isArray(output.columns)) {
|
|
98
|
+
preview.columns = output.columns
|
|
99
|
+
.slice(0, MAX_TABLE_PREVIEW_COLUMNS)
|
|
100
|
+
.map((column) => buildStructuredPreview(column, 1));
|
|
101
|
+
if (output.columns.length > MAX_TABLE_PREVIEW_COLUMNS) {
|
|
102
|
+
preview.columnCount = output.columns.length;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
for (const [key, value] of Object.entries(output)) {
|
|
106
|
+
if (key === "rows" || key === "columns") {
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (value === undefined) {
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
preview[key] = buildStructuredPreview(value, 1);
|
|
113
|
+
}
|
|
114
|
+
return preview;
|
|
115
|
+
}
|
|
116
|
+
function buildMinimalTabularPreview(output) {
|
|
117
|
+
const preview = {
|
|
118
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
119
|
+
rowCount: output.rows.length,
|
|
120
|
+
rows: [],
|
|
121
|
+
truncated: true,
|
|
122
|
+
};
|
|
123
|
+
if (Array.isArray(output.columns)) {
|
|
124
|
+
preview.columns = output.columns
|
|
125
|
+
.slice(0, MAX_PREVIEW_ARRAY_ITEMS)
|
|
126
|
+
.map((column) => buildStructuredPreview(column, 1));
|
|
127
|
+
preview.columnCount = output.columns.length;
|
|
128
|
+
}
|
|
129
|
+
if (typeof output.attemptedSql === "string") {
|
|
130
|
+
preview.attemptedSql = truncateString(output.attemptedSql);
|
|
131
|
+
}
|
|
132
|
+
return preview;
|
|
133
|
+
}
|
|
134
|
+
function buildStructuredPreview(value, depth) {
|
|
135
|
+
if (typeof value === "string") {
|
|
136
|
+
return truncateString(value);
|
|
137
|
+
}
|
|
138
|
+
if (value === null ||
|
|
139
|
+
value === undefined ||
|
|
140
|
+
typeof value === "number" ||
|
|
141
|
+
typeof value === "boolean") {
|
|
142
|
+
return value;
|
|
143
|
+
}
|
|
144
|
+
if (typeof value === "bigint") {
|
|
145
|
+
return String(value);
|
|
146
|
+
}
|
|
147
|
+
if (value instanceof Error) {
|
|
148
|
+
return {
|
|
149
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
150
|
+
message: value.message,
|
|
151
|
+
name: value.name,
|
|
152
|
+
truncated: true,
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
if (Array.isArray(value)) {
|
|
156
|
+
return buildArrayPreview(value, depth);
|
|
157
|
+
}
|
|
158
|
+
if (isRecord(value)) {
|
|
159
|
+
return buildObjectPreview(value, depth);
|
|
160
|
+
}
|
|
161
|
+
return String(value);
|
|
162
|
+
}
|
|
163
|
+
function buildArrayPreview(value, depth) {
|
|
164
|
+
const preview = {
|
|
165
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
166
|
+
items: value
|
|
167
|
+
.slice(0, MAX_PREVIEW_ARRAY_ITEMS)
|
|
168
|
+
.map((item) => buildStructuredPreview(item, depth + 1)),
|
|
169
|
+
length: value.length,
|
|
170
|
+
type: "array",
|
|
171
|
+
};
|
|
172
|
+
if (value.length > MAX_PREVIEW_ARRAY_ITEMS) {
|
|
173
|
+
preview.truncated = true;
|
|
174
|
+
}
|
|
175
|
+
return preview;
|
|
176
|
+
}
|
|
177
|
+
function buildObjectPreview(value, depth) {
|
|
178
|
+
const preview = {
|
|
179
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
180
|
+
};
|
|
181
|
+
const entries = Object.entries(value);
|
|
182
|
+
const visibleEntries = entries.slice(0, MAX_PREVIEW_OBJECT_KEYS);
|
|
183
|
+
for (const [key, nested] of visibleEntries) {
|
|
184
|
+
if (depth >= 2) {
|
|
185
|
+
preview[key] = summarizeLeaf(nested);
|
|
186
|
+
continue;
|
|
187
|
+
}
|
|
188
|
+
preview[key] = buildStructuredPreview(nested, depth + 1);
|
|
189
|
+
}
|
|
190
|
+
if (entries.length > MAX_PREVIEW_OBJECT_KEYS) {
|
|
191
|
+
preview.keyCount = entries.length;
|
|
192
|
+
preview.truncated = true;
|
|
193
|
+
}
|
|
194
|
+
return preview;
|
|
195
|
+
}
|
|
196
|
+
function summarizeLeaf(value) {
|
|
197
|
+
if (typeof value === "string") {
|
|
198
|
+
return truncateString(value);
|
|
199
|
+
}
|
|
200
|
+
if (value === null ||
|
|
201
|
+
value === undefined ||
|
|
202
|
+
typeof value === "number" ||
|
|
203
|
+
typeof value === "boolean") {
|
|
204
|
+
return value;
|
|
205
|
+
}
|
|
206
|
+
if (typeof value === "bigint") {
|
|
207
|
+
return String(value);
|
|
208
|
+
}
|
|
209
|
+
if (Array.isArray(value)) {
|
|
210
|
+
return {
|
|
211
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
212
|
+
length: value.length,
|
|
213
|
+
type: "array",
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
if (isRecord(value)) {
|
|
217
|
+
const keys = Object.keys(value);
|
|
218
|
+
return {
|
|
219
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
220
|
+
keyCount: keys.length,
|
|
221
|
+
keys: keys.slice(0, MAX_PREVIEW_OBJECT_KEYS),
|
|
222
|
+
type: "object",
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
return String(value);
|
|
226
|
+
}
|
|
227
|
+
function buildMinimalPreview(value) {
|
|
228
|
+
if (typeof value === "string") {
|
|
229
|
+
return truncateString(value);
|
|
230
|
+
}
|
|
231
|
+
if (Array.isArray(value)) {
|
|
232
|
+
return {
|
|
233
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
234
|
+
length: value.length,
|
|
235
|
+
truncated: true,
|
|
236
|
+
type: "array",
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
if (isRecord(value)) {
|
|
240
|
+
const preview = {
|
|
241
|
+
[HISTORY_PREVIEW_MARKER]: true,
|
|
242
|
+
truncated: true,
|
|
243
|
+
type: "object",
|
|
244
|
+
};
|
|
245
|
+
if (Array.isArray(value.rows)) {
|
|
246
|
+
preview.rowCount = value.rows.length;
|
|
247
|
+
}
|
|
248
|
+
if (Array.isArray(value.columns)) {
|
|
249
|
+
preview.columnCount = value.columns.length;
|
|
250
|
+
}
|
|
251
|
+
const keys = Object.keys(value);
|
|
252
|
+
if (keys.length > 0) {
|
|
253
|
+
preview.keys = keys.slice(0, MAX_PREVIEW_OBJECT_KEYS);
|
|
254
|
+
preview.keyCount = keys.length;
|
|
255
|
+
}
|
|
256
|
+
if (typeof value.attemptedSql === "string") {
|
|
257
|
+
preview.attemptedSql = truncateString(value.attemptedSql);
|
|
258
|
+
}
|
|
259
|
+
if (typeof value.error === "string") {
|
|
260
|
+
preview.error = truncateString(value.error);
|
|
261
|
+
}
|
|
262
|
+
return preview;
|
|
263
|
+
}
|
|
264
|
+
if (value === null ||
|
|
265
|
+
value === undefined ||
|
|
266
|
+
typeof value === "number" ||
|
|
267
|
+
typeof value === "boolean") {
|
|
268
|
+
return value;
|
|
269
|
+
}
|
|
270
|
+
if (typeof value === "bigint") {
|
|
271
|
+
return String(value);
|
|
272
|
+
}
|
|
273
|
+
return String(value);
|
|
274
|
+
}
|
|
275
|
+
function truncateString(value) {
|
|
276
|
+
if (value.length <= MAX_PREVIEW_STRING_CHARS) {
|
|
277
|
+
return value;
|
|
278
|
+
}
|
|
279
|
+
return `${value.slice(0, MAX_PREVIEW_STRING_CHARS - 1)}…`;
|
|
280
|
+
}
|
|
281
|
+
function estimateStructuredTokens(value) {
|
|
282
|
+
const serialized = serializeValue(value);
|
|
283
|
+
return serialized.length / 2;
|
|
284
|
+
}
|
|
285
|
+
function serializeValue(value) {
|
|
286
|
+
if (value === undefined) {
|
|
287
|
+
return "";
|
|
288
|
+
}
|
|
289
|
+
if (typeof value === "string") {
|
|
290
|
+
return value;
|
|
291
|
+
}
|
|
292
|
+
if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
|
|
293
|
+
return String(value);
|
|
294
|
+
}
|
|
295
|
+
if (value instanceof Error) {
|
|
296
|
+
return JSON.stringify({
|
|
297
|
+
message: value.message,
|
|
298
|
+
name: value.name,
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
try {
|
|
302
|
+
const serialized = JSON.stringify(value, (_key, nested) => {
|
|
303
|
+
if (typeof nested === "bigint") {
|
|
304
|
+
return String(nested);
|
|
305
|
+
}
|
|
306
|
+
if (nested instanceof Error) {
|
|
307
|
+
return {
|
|
308
|
+
message: nested.message,
|
|
309
|
+
name: nested.name,
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
return nested;
|
|
313
|
+
});
|
|
314
|
+
return serialized ?? String(value);
|
|
315
|
+
}
|
|
316
|
+
catch {
|
|
317
|
+
return String(value);
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
function isHistoryPreview(value) {
|
|
321
|
+
return isRecord(value) && value[HISTORY_PREVIEW_MARKER] === true;
|
|
322
|
+
}
|
|
323
|
+
function isRecord(value) {
|
|
324
|
+
return typeof value === "object" && value !== null;
|
|
325
|
+
}
|
|
326
|
+
function unwrapJsonToolResultOutput(value) {
|
|
327
|
+
if (!isRecord(value) || value.type !== "json" || !("value" in value)) {
|
|
328
|
+
return undefined;
|
|
329
|
+
}
|
|
330
|
+
return {
|
|
331
|
+
value: value.value,
|
|
332
|
+
wrapper: value,
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
function isTabularOutput(value) {
|
|
336
|
+
return isRecord(value) && Array.isArray(value.rows);
|
|
337
|
+
}
|
|
338
|
+
//# sourceMappingURL=tool-result-history.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-result-history.js","sourceRoot":"","sources":["../../../src/harness/tool-result-history.ts"],"names":[],"mappings":"AAEA,MAAM,sCAAsC,GAAG,MAAM,CAAC;AACtD,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AACpD,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAClC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AACvC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAIlC;;;;;;;GAOG;AACH,MAAM,UAAU,mCAAmC,CACjD,QAAiC,EACjC,mBAAmB,GAAG,sCAAsC;IAE5D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9B,kCAAkC,CAAC,OAAO,EAAE,mBAAmB,CAAC,CACjE,CAAC;AACJ,CAAC;AAED,SAAS,kCAAkC,CACzC,OAAqB,EACrB,mBAA2B;IAE3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,IAAI,GAAG,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QACvE,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,GAAG,OAAO;QACV,OAAO,EAAE,OAAiC;KAC3B,CAAC;AACpB,CAAC;AAED,SAAS,8BAA8B,CACrC,IAA6B,EAC7B,mBAA2B;IAE3B,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,mCAAmC,CAAC,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrF,IAAI,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,GAAG,IAAI;QACP,MAAM,EAAE,MAA4B;KACrC,CAAC;AACJ,CAAC;AAED,SAAS,mCAAmC,CAC1C,MAAe,EACf,mBAA2B;IAE3B,IAAI,MAAM,KAAK,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,mCAAmC,CACzD,iBAAiB,CAAC,KAAK,EACvB,mBAAmB,CACpB,CAAC;QAEF,IAAI,eAAe,KAAK,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAChD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO;YACL,GAAG,iBAAiB,CAAC,OAAO;YAC5B,KAAK,EAAE,eAAe;SACvB,CAAC;IACJ,CAAC;IAED,IAAI,wBAAwB,CAAC,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClD,IAAI,wBAAwB,CAAC,OAAO,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAC7D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,mBAAmB,CAC1B,MAG2B,EAC3B,mBAA2B;IAE3B,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAEpE,OAAO,QAAQ,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,+BAA+B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,wBAAwB,CAAC,OAAO,CAAC,IAAI,mBAAmB,EAAE,CAAC;YAC7D,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,+BAA+B,CACtC,MAG2B,EAC3B,QAAgB;IAEhB,MAAM,OAAO,GAA4B;QACvC,CAAC,sBAAsB,CAAC,EAAE,IAAI;QAC9B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;QAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACjF,SAAS,EAAE,IAAI;KAChB,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO;aAC7B,KAAK,CAAC,CAAC,EAAE,yBAAyB,CAAC;aACnC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,yBAAyB,EAAE,CAAC;YACtD,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,0BAA0B,CACjC,MAG2B;IAE3B,MAAM,OAAO,GAA4B;QACvC,CAAC,sBAAsB,CAAC,EAAE,IAAI;QAC9B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;QAC5B,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,IAAI;KAChB,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO;aAC7B,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC;aACjC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO,CAAC,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc,EAAE,KAAa;IAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IACE,KAAK,KAAK,IAAI;QACd,KAAK,KAAK,SAAS;QACnB,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS,EAC1B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO;YACL,CAAC,sBAAsB,CAAC,EAAE,IAAI;YAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,IAAI;SAChB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAyB,EAAE,KAAa;IACjE,MAAM,OAAO,GAA4B;QACvC,CAAC,sBAAsB,CAAC,EAAE,IAAI;QAC9B,KAAK,EAAE,KAAK;aACT,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC;aACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,OAAO;KACd,CAAC;IAEF,IAAI,KAAK,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC3C,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAwC,EACxC,KAAa;IAEb,MAAM,OAAO,GAA4B;QACvC,CAAC,sBAAsB,CAAC,EAAE,IAAI;KAC/B,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAEjE,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;QAC3C,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;YACrC,SAAS;QACX,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC7C,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;QAClC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IACE,KAAK,KAAK,IAAI;QACd,KAAK,KAAK,SAAS;QACnB,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS,EAC1B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,CAAC,sBAAsB,CAAC,EAAE,IAAI;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,OAAO;SACd,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO;YACL,CAAC,sBAAsB,CAAC,EAAE,IAAI;YAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC;YAC5C,IAAI,EAAE,QAAQ;SACf,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,CAAC,sBAAsB,CAAC,EAAE,IAAI;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,OAAO;SACd,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,OAAO,GAA4B;YACvC,CAAC,sBAAsB,CAAC,EAAE,IAAI;YAC9B,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,QAAQ;SACf,CAAC;QAEF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;QACvC,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;YACtD,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO,CAAC,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IACE,KAAK,KAAK,IAAI;QACd,KAAK,KAAK,SAAS;QACnB,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS,EAC1B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,IAAI,KAAK,CAAC,MAAM,IAAI,wBAAwB,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,wBAAwB,GAAG,CAAC,CAAC,GAAG,CAAC;AAC5D,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,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,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,KAAK,IAAI,CAAC;AACnE,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAShD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAGkB;KAC5B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IAIrC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -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.32";
|
|
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
|