@ykurilov/agent-chat-core 0.108.0 → 0.109.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +1 -1
- package/dist/{chunk-FUIPWUAH.js → chunk-2MVJW2PT.js} +415 -403
- package/dist/chunk-2MVJW2PT.js.map +1 -0
- package/dist/index.js +1 -1
- package/dist/storage-contract.js +1 -1
- package/dist/types/agent-run/run-agent-turn.d.ts +1 -1
- package/dist/types/agent-run/step-context.d.ts +13 -2
- package/dist/types/chat-service.d.ts +2 -2
- package/package.json +1 -1
- package/dist/chunk-FUIPWUAH.js.map +0 -1
|
@@ -1990,6 +1990,321 @@ function lengthCutForModel(part) {
|
|
|
1990
1990
|
return part.type === LENGTH_CUT_PART_TYPE ? { type: "text", text: LENGTH_CUT_NOTE } : void 0;
|
|
1991
1991
|
}
|
|
1992
1992
|
|
|
1993
|
+
// src/agent-run/turn-usage.ts
|
|
1994
|
+
import { asSchema } from "ai";
|
|
1995
|
+
|
|
1996
|
+
// src/conversation/token-usage.ts
|
|
1997
|
+
function emptyTokenUsage() {
|
|
1998
|
+
return { inputTokens: 0, cachedInputTokens: 0, outputTokens: 0, reasoningTokens: 0 };
|
|
1999
|
+
}
|
|
2000
|
+
function addTokenUsage(total, usage) {
|
|
2001
|
+
total.inputTokens += usage.inputTokens ?? 0;
|
|
2002
|
+
total.cachedInputTokens += usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
2003
|
+
total.outputTokens += usage.outputTokens ?? 0;
|
|
2004
|
+
total.reasoningTokens += usage.outputTokenDetails?.reasoningTokens ?? 0;
|
|
2005
|
+
const cacheWrite = usage.inputTokenDetails?.cacheWriteTokens ?? 0;
|
|
2006
|
+
if (cacheWrite > 0) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + cacheWrite;
|
|
2007
|
+
}
|
|
2008
|
+
function isEmptyTokenUsage(usage) {
|
|
2009
|
+
return usage.inputTokens === 0 && usage.outputTokens === 0 && usage.reasoningTokens === 0 && (usage.cacheWriteTokens ?? 0) === 0;
|
|
2010
|
+
}
|
|
2011
|
+
|
|
2012
|
+
// src/agent-run/turn-usage.ts
|
|
2013
|
+
var SHARES_PER_TOKEN = 6;
|
|
2014
|
+
var FILE_SHARES = 1600 * SHARES_PER_TOKEN;
|
|
2015
|
+
var tokensOf = (shares) => Math.ceil(shares / SHARES_PER_TOKEN);
|
|
2016
|
+
function textShares(text) {
|
|
2017
|
+
let shares = 0;
|
|
2018
|
+
for (let index = 0; index < text.length; index++) shares += charShares(text.charCodeAt(index));
|
|
2019
|
+
return shares;
|
|
2020
|
+
}
|
|
2021
|
+
function charShares(code) {
|
|
2022
|
+
if (code < 128) return isLatinLetterDigitOrSpace(code) ? 2 : 3;
|
|
2023
|
+
return isDenseScript(code) ? 6 : 3;
|
|
2024
|
+
}
|
|
2025
|
+
function isLatinLetterDigitOrSpace(code) {
|
|
2026
|
+
const isLetterOrDigit = code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122;
|
|
2027
|
+
return isLetterOrDigit || code === 32 || code === 10 || code === 9 || code === 13;
|
|
2028
|
+
}
|
|
2029
|
+
function isDenseScript(code) {
|
|
2030
|
+
return code >= 11904 && code <= 40959 || code >= 44032 && code <= 57343 || code >= 63744 && code <= 64255 || code >= 65280 && code <= 65519;
|
|
2031
|
+
}
|
|
2032
|
+
function estimateTextTokens(text) {
|
|
2033
|
+
return tokensOf(textShares(text));
|
|
2034
|
+
}
|
|
2035
|
+
function createTurnUsage(now = () => /* @__PURE__ */ new Date()) {
|
|
2036
|
+
const steps = [];
|
|
2037
|
+
let providerId = "";
|
|
2038
|
+
let fixedShares = 0;
|
|
2039
|
+
let requestShares = [];
|
|
2040
|
+
let requestTimes = [];
|
|
2041
|
+
let startedSteps = 0;
|
|
2042
|
+
let finishedSteps = 0;
|
|
2043
|
+
let written = { shares: 0, reasoningShares: 0, content: false };
|
|
2044
|
+
let generationIds = [];
|
|
2045
|
+
let requestOpen = false;
|
|
2046
|
+
let streamedCalls = /* @__PURE__ */ new Set();
|
|
2047
|
+
function estimate(stepIndex, shares, reasoningShares) {
|
|
2048
|
+
const previous = steps.findLast((step) => !step.erased)?.usage;
|
|
2049
|
+
const inputTokens = Math.max(tokensOf(requestShares[stepIndex] ?? fixedShares), previous ? previous.inputTokens + previous.outputTokens : 0);
|
|
2050
|
+
const cachedInputTokens = previous && previous.cachedInputTokens > 0 ? Math.min(previous.inputTokens, inputTokens) : 0;
|
|
2051
|
+
return {
|
|
2052
|
+
inputTokens,
|
|
2053
|
+
cachedInputTokens,
|
|
2054
|
+
outputTokens: tokensOf(shares + reasoningShares),
|
|
2055
|
+
reasoningTokens: tokensOf(reasoningShares),
|
|
2056
|
+
estimated: true
|
|
2057
|
+
};
|
|
2058
|
+
}
|
|
2059
|
+
function unfinishedStep() {
|
|
2060
|
+
const wroteSomething = startedSteps > finishedSteps && written.content;
|
|
2061
|
+
if (!wroteSomething && !requestOpen) return null;
|
|
2062
|
+
const index = wroteSomething ? startedSteps - 1 : finishedSteps;
|
|
2063
|
+
const usage = estimate(index, written.shares, written.reasoningShares);
|
|
2064
|
+
return { usage, providerId, generationIds, at: stepTime(index) };
|
|
2065
|
+
}
|
|
2066
|
+
function stepTime(index) {
|
|
2067
|
+
return requestTimes[index] ?? now().toISOString();
|
|
2068
|
+
}
|
|
2069
|
+
function nextStep() {
|
|
2070
|
+
written = { shares: 0, reasoningShares: 0, content: false };
|
|
2071
|
+
generationIds = [];
|
|
2072
|
+
requestOpen = false;
|
|
2073
|
+
}
|
|
2074
|
+
return {
|
|
2075
|
+
/** Новая попытка у провайдера `attemptProviderId`: инструкция и описания инструментов её запроса. */
|
|
2076
|
+
beginAttempt(request, attemptProviderId) {
|
|
2077
|
+
providerId = attemptProviderId;
|
|
2078
|
+
fixedShares = instructionsShares(request.instructions) + toolsShares(request.tools);
|
|
2079
|
+
requestShares = [];
|
|
2080
|
+
requestTimes = [];
|
|
2081
|
+
startedSteps = 0;
|
|
2082
|
+
finishedSteps = 0;
|
|
2083
|
+
nextStep();
|
|
2084
|
+
streamedCalls = /* @__PURE__ */ new Set();
|
|
2085
|
+
},
|
|
2086
|
+
/** Перед шагом попытки: сообщения его запроса. */
|
|
2087
|
+
beforeStep(stepNumber, messages) {
|
|
2088
|
+
requestShares[stepNumber] = fixedShares + messagesShares(messages);
|
|
2089
|
+
requestTimes[stepNumber] = now().toISOString();
|
|
2090
|
+
},
|
|
2091
|
+
/** Провайдер принял запрос идущего шага и начал поток: с этого мига вход оплачен (FR-051, FR-058). */
|
|
2092
|
+
requestOpened(request) {
|
|
2093
|
+
generationIds.push(request.generationId);
|
|
2094
|
+
requestOpen = true;
|
|
2095
|
+
},
|
|
2096
|
+
/** Провайдер сам отказал посреди потока: такой запрос не оплачивается. */
|
|
2097
|
+
requestRefused() {
|
|
2098
|
+
requestOpen = false;
|
|
2099
|
+
},
|
|
2100
|
+
/** Кусок UI-потока попытки: начала шагов и написанное. */
|
|
2101
|
+
observe(chunk) {
|
|
2102
|
+
if (chunk.type === "start-step") {
|
|
2103
|
+
startedSteps += 1;
|
|
2104
|
+
written = { shares: 0, reasoningShares: 0, content: false };
|
|
2105
|
+
return;
|
|
2106
|
+
}
|
|
2107
|
+
if (chunk.type === "text-delta") written.shares += textShares(chunk.delta);
|
|
2108
|
+
else if (chunk.type === "reasoning-delta") written.reasoningShares += textShares(chunk.delta);
|
|
2109
|
+
else if (chunk.type === "tool-input-delta") {
|
|
2110
|
+
streamedCalls.add(chunk.toolCallId);
|
|
2111
|
+
written.shares += textShares(chunk.inputTextDelta);
|
|
2112
|
+
} else if (chunk.type === "tool-input-available" && !streamedCalls.has(chunk.toolCallId)) {
|
|
2113
|
+
written.shares += textShares(JSON.stringify(chunk.input ?? null));
|
|
2114
|
+
} else if (!isWritten(chunk)) return;
|
|
2115
|
+
written.content = true;
|
|
2116
|
+
},
|
|
2117
|
+
/** Шаг завершён: числа провайдера или, если их нет, оценка. */
|
|
2118
|
+
finishStep(usage, content) {
|
|
2119
|
+
const index = finishedSteps;
|
|
2120
|
+
finishedSteps += 1;
|
|
2121
|
+
let stepUsage;
|
|
2122
|
+
if ((usage.inputTokens ?? 0) > 0 || (usage.outputTokens ?? 0) > 0) {
|
|
2123
|
+
stepUsage = emptyTokenUsage();
|
|
2124
|
+
addTokenUsage(stepUsage, usage);
|
|
2125
|
+
} else {
|
|
2126
|
+
const output = contentShares(content);
|
|
2127
|
+
stepUsage = estimate(index, output.shares, output.reasoningShares);
|
|
2128
|
+
}
|
|
2129
|
+
steps.push({ usage: stepUsage, providerId, generationIds, at: stepTime(index) });
|
|
2130
|
+
nextStep();
|
|
2131
|
+
},
|
|
2132
|
+
/** Шаг без запроса к провайдеру (готовый текст `endTurn`): в расход не идёт. */
|
|
2133
|
+
finishFreeStep() {
|
|
2134
|
+
finishedSteps += 1;
|
|
2135
|
+
nextStep();
|
|
2136
|
+
},
|
|
2137
|
+
/**
|
|
2138
|
+
* Попытка кончилась: недописанный шаг с написанным или с открытым запросом — в расход хода оценкой. `erased` — этот
|
|
2139
|
+
* шаг стёрт: оплачен, но следующий шаг его не видит.
|
|
2140
|
+
*/
|
|
2141
|
+
closeAttempt(options2 = {}) {
|
|
2142
|
+
const unfinished = unfinishedStep();
|
|
2143
|
+
if (unfinished) steps.push(options2.erased ? { ...unfinished, erased: true } : unfinished);
|
|
2144
|
+
finishedSteps = startedSteps;
|
|
2145
|
+
nextStep();
|
|
2146
|
+
},
|
|
2147
|
+
/** Расход каждого шага хода, без идущего. */
|
|
2148
|
+
steps() {
|
|
2149
|
+
return steps.map((step) => step.usage);
|
|
2150
|
+
},
|
|
2151
|
+
/** Шаги хода по провайдерам, в порядке первого шага у каждого: каждому — запись по его цене. */
|
|
2152
|
+
stepsByProvider() {
|
|
2153
|
+
const groups = /* @__PURE__ */ new Map();
|
|
2154
|
+
for (const step of steps) groups.set(step.providerId, [...groups.get(step.providerId) ?? [], { ...step.usage, at: step.at }]);
|
|
2155
|
+
return [...groups].map(([id, usages]) => ({ providerId: id, steps: usages }));
|
|
2156
|
+
},
|
|
2157
|
+
/**
|
|
2158
|
+
* Шаги, расход которых стоит узнать у провайдера (FR-058): оценённый — все его генерации; оплаченный по числам —
|
|
2159
|
+
* генерации до последней (повторы, оборванные до первого куска). Шаг с генерацией без номера не узнать — его нет.
|
|
2160
|
+
*/
|
|
2161
|
+
stepsToSettle() {
|
|
2162
|
+
return steps.flatMap((step) => {
|
|
2163
|
+
const ids = step.usage.estimated ? step.generationIds : step.generationIds.slice(0, -1);
|
|
2164
|
+
if (ids.length === 0 || !ids.every((id) => id !== void 0)) return [];
|
|
2165
|
+
return [{ providerId: step.providerId, at: step.at, estimate: step.usage.estimated ? step.usage : null, generationIds: ids }];
|
|
2166
|
+
});
|
|
2167
|
+
},
|
|
2168
|
+
/** Шаги хода с провайдерами вместе с оценкой идущего — в идущий ответ для восстановления (FR-052). */
|
|
2169
|
+
pendingSteps() {
|
|
2170
|
+
const unfinished = unfinishedStep();
|
|
2171
|
+
return (unfinished ? [...steps, unfinished] : steps).map((step) => ({ ...step.usage, providerId: step.providerId, at: step.at }));
|
|
2172
|
+
},
|
|
2173
|
+
/** Расход хода на этот момент вместе с оценкой идущего шага; ничего не потрачено — `null`. */
|
|
2174
|
+
total() {
|
|
2175
|
+
const unfinished = unfinishedStep();
|
|
2176
|
+
return sumOfSteps((unfinished ? [...steps, unfinished] : steps).map((step) => step.usage));
|
|
2177
|
+
}
|
|
2178
|
+
};
|
|
2179
|
+
}
|
|
2180
|
+
function sumOfSteps(steps) {
|
|
2181
|
+
const last = steps.at(-1);
|
|
2182
|
+
if (!last) return null;
|
|
2183
|
+
const total = emptyTokenUsage();
|
|
2184
|
+
for (const step of steps) {
|
|
2185
|
+
total.inputTokens += step.inputTokens;
|
|
2186
|
+
total.cachedInputTokens += step.cachedInputTokens;
|
|
2187
|
+
total.outputTokens += step.outputTokens;
|
|
2188
|
+
total.reasoningTokens += step.reasoningTokens;
|
|
2189
|
+
if (step.cacheWriteTokens) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + step.cacheWriteTokens;
|
|
2190
|
+
}
|
|
2191
|
+
const contextTokens = last.inputTokens + last.outputTokens;
|
|
2192
|
+
return { ...total, ...contextTokens > 0 && { contextTokens }, ...steps.some((step) => step.estimated) && { estimated: true } };
|
|
2193
|
+
}
|
|
2194
|
+
function isWritten(chunk) {
|
|
2195
|
+
return chunk.type.startsWith("source-") || chunk.type === "file" || chunk.type === "tool-approval-request" || chunk.type.startsWith("data-");
|
|
2196
|
+
}
|
|
2197
|
+
function instructionsShares(instructions) {
|
|
2198
|
+
if (typeof instructions === "string") return textShares(instructions);
|
|
2199
|
+
if (Array.isArray(instructions)) return instructions.reduce((sum, item) => sum + instructionsShares(item), 0);
|
|
2200
|
+
const content = instructions?.content;
|
|
2201
|
+
return typeof content === "string" ? textShares(content) : 0;
|
|
2202
|
+
}
|
|
2203
|
+
function toolsShares(tools) {
|
|
2204
|
+
let shares = 0;
|
|
2205
|
+
for (const [name, tool4] of Object.entries(tools ?? {})) {
|
|
2206
|
+
shares += textShares(name) + (typeof tool4.description === "string" ? textShares(tool4.description) : 0);
|
|
2207
|
+
const schema = tool4.inputSchema && asSchema(tool4.inputSchema).jsonSchema;
|
|
2208
|
+
if (schema && typeof schema.then !== "function") shares += textShares(JSON.stringify(schema));
|
|
2209
|
+
}
|
|
2210
|
+
return shares;
|
|
2211
|
+
}
|
|
2212
|
+
function messagesShares(messages) {
|
|
2213
|
+
let shares = 0;
|
|
2214
|
+
for (const message of messages) {
|
|
2215
|
+
if (typeof message.content === "string") shares += textShares(message.content);
|
|
2216
|
+
else for (const part of message.content) shares += partShares(part);
|
|
2217
|
+
}
|
|
2218
|
+
return shares;
|
|
2219
|
+
}
|
|
2220
|
+
function partShares(part) {
|
|
2221
|
+
switch (part.type) {
|
|
2222
|
+
case "text":
|
|
2223
|
+
case "reasoning":
|
|
2224
|
+
return textShares(part.text);
|
|
2225
|
+
case "image":
|
|
2226
|
+
case "file":
|
|
2227
|
+
return FILE_SHARES;
|
|
2228
|
+
case "tool-call":
|
|
2229
|
+
return textShares(part.toolName) + textShares(JSON.stringify(part.input ?? null));
|
|
2230
|
+
case "tool-result":
|
|
2231
|
+
return part.output.type === "content" ? part.output.value.reduce((sum, item) => sum + (item.type === "text" ? textShares(item.text) : FILE_SHARES), 0) : textShares(JSON.stringify(part.output));
|
|
2232
|
+
default:
|
|
2233
|
+
return textShares(JSON.stringify(part));
|
|
2234
|
+
}
|
|
2235
|
+
}
|
|
2236
|
+
function contentShares(content) {
|
|
2237
|
+
let shares = 0;
|
|
2238
|
+
let reasoningShares = 0;
|
|
2239
|
+
for (const part of content) {
|
|
2240
|
+
if (part.type === "text") shares += textShares(part.text);
|
|
2241
|
+
else if (part.type === "reasoning") reasoningShares += textShares(part.text);
|
|
2242
|
+
else if (part.type === "tool-call") shares += textShares(JSON.stringify(part.input ?? null));
|
|
2243
|
+
}
|
|
2244
|
+
return { shares, reasoningShares };
|
|
2245
|
+
}
|
|
2246
|
+
|
|
2247
|
+
// src/agent-run/step-context.ts
|
|
2248
|
+
var DEFAULT_STEP_CONTEXT_TIMEOUT_MS = 5e3;
|
|
2249
|
+
var STEP_CONTEXT_TAG = "step_context";
|
|
2250
|
+
var STEP_CONTEXT_LEAD = "\u0421\u043B\u0443\u0436\u0435\u0431\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043A \u044D\u0442\u043E\u043C\u0443 \u0448\u0430\u0433\u0443 \u043E\u0442\u0432\u0435\u0442\u0430. \u042D\u0442\u043E \u043D\u0435 \u043D\u043E\u0432\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430: \u043E\u043D \u0438\u0445 \u043D\u0435 \u043F\u0438\u0441\u0430\u043B \u0438 \u043D\u0435 \u0432\u0438\u0434\u0438\u0442 \u0438 \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0430 \u043D\u0438\u0445 \u043D\u0435 \u0436\u0434\u0451\u0442. \u0425\u043E\u0434 \u0442\u043E\u0442 \u0436\u0435: \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u043E\u0442\u0432\u0435\u0447\u0430\u0442\u044C \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0432\u044B\u0448\u0435.";
|
|
2251
|
+
function stepContextBlock(text) {
|
|
2252
|
+
return `<${STEP_CONTEXT_TAG}>
|
|
2253
|
+
${STEP_CONTEXT_LEAD}
|
|
2254
|
+
${text}
|
|
2255
|
+
</${STEP_CONTEXT_TAG}>`;
|
|
2256
|
+
}
|
|
2257
|
+
function createStepSnapshots(options2) {
|
|
2258
|
+
let previous;
|
|
2259
|
+
return {
|
|
2260
|
+
async messagesFor({ messages, trailing, context }) {
|
|
2261
|
+
const withoutPrevious = previous ? messages.filter((message) => message !== previous) : messages;
|
|
2262
|
+
previous = void 0;
|
|
2263
|
+
const own = await snapshotText(options2, context);
|
|
2264
|
+
if (!own) return { messages: withoutPrevious, tokens: 0 };
|
|
2265
|
+
const text = stepContextBlock(own);
|
|
2266
|
+
const snapshot = { role: "user", content: [{ type: "text", text }] };
|
|
2267
|
+
previous = snapshot;
|
|
2268
|
+
const at = withoutPrevious.length - Math.min(trailing, withoutPrevious.length);
|
|
2269
|
+
return { messages: [...withoutPrevious.slice(0, at), snapshot, ...withoutPrevious.slice(at)], tokens: estimateTextTokens(text) };
|
|
2270
|
+
}
|
|
2271
|
+
};
|
|
2272
|
+
}
|
|
2273
|
+
async function snapshotText(options2, context) {
|
|
2274
|
+
const timeoutMs = options2.timeoutMs ?? DEFAULT_STEP_CONTEXT_TIMEOUT_MS;
|
|
2275
|
+
const log = (message) => options2.logError(`[\u0441\u043D\u0438\u043C\u043E\u043A \u0448\u0430\u0433\u0430] \u0447\u0430\u0442=${options2.chatId} \u0448\u0430\u0433=${context.stepNumber} ${message}`);
|
|
2276
|
+
const stop = context.abortSignal;
|
|
2277
|
+
const ownAbort = new AbortController();
|
|
2278
|
+
let timer;
|
|
2279
|
+
let onStop;
|
|
2280
|
+
const cutOff = new Promise((resolve) => {
|
|
2281
|
+
if (Number.isFinite(timeoutMs)) timer = setTimeout(() => resolve("timeout"), timeoutMs);
|
|
2282
|
+
onStop = () => resolve("stopped");
|
|
2283
|
+
if (stop.aborted) onStop();
|
|
2284
|
+
else stop.addEventListener("abort", onStop, { once: true });
|
|
2285
|
+
});
|
|
2286
|
+
try {
|
|
2287
|
+
const call = Promise.resolve().then(() => options2.stepContext({ ...context, abortSignal: AbortSignal.any([stop, ownAbort.signal]) }));
|
|
2288
|
+
const outcome = await Promise.race([call.then((text2) => ({ text: text2 })), cutOff]);
|
|
2289
|
+
if (outcome === "stopped") return null;
|
|
2290
|
+
if (outcome === "timeout") {
|
|
2291
|
+
ownAbort.abort(new Error(`stepContext \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`));
|
|
2292
|
+
log(`\u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`);
|
|
2293
|
+
return null;
|
|
2294
|
+
}
|
|
2295
|
+
const { text } = outcome;
|
|
2296
|
+
if (text === null || text === void 0 || text === "") return null;
|
|
2297
|
+
if (typeof text !== "string") throw new TypeError(`stepContext \u0432\u0435\u0440\u043D\u0443\u043B ${typeof text}, \u0430 \u043D\u0435 \u0441\u0442\u0440\u043E\u043A\u0443`);
|
|
2298
|
+
return text;
|
|
2299
|
+
} catch (error) {
|
|
2300
|
+
log(error instanceof Error ? error.message : String(error));
|
|
2301
|
+
return null;
|
|
2302
|
+
} finally {
|
|
2303
|
+
clearTimeout(timer);
|
|
2304
|
+
stop.removeEventListener("abort", onStop);
|
|
2305
|
+
}
|
|
2306
|
+
}
|
|
2307
|
+
|
|
1993
2308
|
// src/agent-run/unanswered-messages.ts
|
|
1994
2309
|
var UNANSWERED_NOTE = "[\u041E\u0442\u0432\u0435\u0442\u0430 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0435\u0442: \u0445\u043E\u0434 \u043E\u0431\u043E\u0440\u0432\u0430\u043B\u0441\u044F \u0434\u043E \u043F\u0435\u0440\u0432\u044B\u0445 \u0441\u043B\u043E\u0432]";
|
|
1995
2310
|
function withUnansweredMarked(messages) {
|
|
@@ -2010,6 +2325,7 @@ var CORE_SERVICE_BLOCKS = [
|
|
|
2010
2325
|
{ tag: "conversation_summary" },
|
|
2011
2326
|
{ tag: "answer_progress" },
|
|
2012
2327
|
{ tag: "screen_place" },
|
|
2328
|
+
{ tag: STEP_CONTEXT_TAG },
|
|
2013
2329
|
{ name: "service_note", line: "[\u0421\u043B\u0443\u0436\u0435\u0431\u043D\u0430\u044F \u043F\u043E\u043C\u0435\u0442\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F", match: /^\[Служебная пометка приложения, человек её не писал и не видит: .+\]$/ },
|
|
2014
2330
|
{ name: "context_gone", line: "[\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442: \xAB", match: /^\[Больше не действует: «[^»\n]+»(?:, «[^»\n]+»)*\]$/ },
|
|
2015
2331
|
{ name: "context_hidden", line: "[\u041D\u0435 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u043E \u0440\u0430\u0434\u0438 \u043C\u0435\u0441\u0442\u0430, \u043D\u043E \u043F\u043E-\u043F\u0440\u0435\u0436\u043D\u0435\u043C\u0443 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442: \xAB", match: /^\[Не показано ради места, но по-прежнему действует: «[^»\n]+»(?:, «[^»\n]+»)*\]$/ },
|
|
@@ -3426,22 +3742,6 @@ async function resolveViewerOutsideTurn(source, turn, signal) {
|
|
|
3426
3742
|
// src/helpers/run-helper.ts
|
|
3427
3743
|
import { generateText as generateText2, stepCountIs as stepCountIs2 } from "ai";
|
|
3428
3744
|
|
|
3429
|
-
// src/conversation/token-usage.ts
|
|
3430
|
-
function emptyTokenUsage() {
|
|
3431
|
-
return { inputTokens: 0, cachedInputTokens: 0, outputTokens: 0, reasoningTokens: 0 };
|
|
3432
|
-
}
|
|
3433
|
-
function addTokenUsage(total, usage) {
|
|
3434
|
-
total.inputTokens += usage.inputTokens ?? 0;
|
|
3435
|
-
total.cachedInputTokens += usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
3436
|
-
total.outputTokens += usage.outputTokens ?? 0;
|
|
3437
|
-
total.reasoningTokens += usage.outputTokenDetails?.reasoningTokens ?? 0;
|
|
3438
|
-
const cacheWrite = usage.inputTokenDetails?.cacheWriteTokens ?? 0;
|
|
3439
|
-
if (cacheWrite > 0) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + cacheWrite;
|
|
3440
|
-
}
|
|
3441
|
-
function isEmptyTokenUsage(usage) {
|
|
3442
|
-
return usage.inputTokens === 0 && usage.outputTokens === 0 && usage.reasoningTokens === 0 && (usage.cacheWriteTokens ?? 0) === 0;
|
|
3443
|
-
}
|
|
3444
|
-
|
|
3445
3745
|
// src/provider-errors/error-signs.ts
|
|
3446
3746
|
var signs = (patterns) => new RegExp(patterns.join("|"), "i");
|
|
3447
3747
|
var OVERFLOW_SIGNS = [
|
|
@@ -4289,347 +4589,111 @@ function observeModelCalls(model, context) {
|
|
|
4289
4589
|
return { ...result, stream };
|
|
4290
4590
|
}
|
|
4291
4591
|
}
|
|
4292
|
-
});
|
|
4293
|
-
function openCall(params, attempt) {
|
|
4294
|
-
const startedAtMs = now();
|
|
4295
|
-
const request = requestOf(params);
|
|
4296
|
-
const response = { text: "", reasoning: "", toolCalls: [], finishReason: null };
|
|
4297
|
-
let usage = null;
|
|
4298
|
-
let firstChunkMs = null;
|
|
4299
|
-
let settled2 = false;
|
|
4300
|
-
const firstChunk = () => {
|
|
4301
|
-
firstChunkMs ??= now() - startedAtMs;
|
|
4302
|
-
};
|
|
4303
|
-
return {
|
|
4304
|
-
firstChunk,
|
|
4305
|
-
collectPart(part) {
|
|
4306
|
-
if (part.type === "stream-start" || part.type === "response-metadata" || part.type === "raw") return;
|
|
4307
|
-
firstChunk();
|
|
4308
|
-
if (part.type === "text-delta") response.text += part.delta;
|
|
4309
|
-
else if (part.type === "reasoning-delta") response.reasoning += part.delta;
|
|
4310
|
-
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4311
|
-
else if (part.type === "finish") ({ usage } = finishOf(part.finishReason, part.usage));
|
|
4312
|
-
},
|
|
4313
|
-
collectContent(content) {
|
|
4314
|
-
for (const part of content) {
|
|
4315
|
-
if (part.type === "text") response.text += part.text;
|
|
4316
|
-
else if (part.type === "reasoning") response.reasoning += part.text;
|
|
4317
|
-
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4318
|
-
}
|
|
4319
|
-
},
|
|
4320
|
-
finish(reason, spent) {
|
|
4321
|
-
({ usage } = finishOf(reason, spent));
|
|
4322
|
-
},
|
|
4323
|
-
settle(status, error) {
|
|
4324
|
-
if (settled2) return;
|
|
4325
|
-
settled2 = true;
|
|
4326
|
-
const event = {
|
|
4327
|
-
callId: crypto.randomUUID(),
|
|
4328
|
-
chatId: context.chatId,
|
|
4329
|
-
ownerId: context.ownerId,
|
|
4330
|
-
messageId: context.messageId,
|
|
4331
|
-
purpose: context.purpose,
|
|
4332
|
-
attempt,
|
|
4333
|
-
modelId: context.modelId,
|
|
4334
|
-
providerId: context.providerId,
|
|
4335
|
-
request,
|
|
4336
|
-
response,
|
|
4337
|
-
usage,
|
|
4338
|
-
costUsd: usage && context.price ? costOfUsage(usage, context.price, new Date(startedAtMs)) : null,
|
|
4339
|
-
startedAt: new Date(startedAtMs),
|
|
4340
|
-
firstChunkMs,
|
|
4341
|
-
durationMs: now() - startedAtMs,
|
|
4342
|
-
status,
|
|
4343
|
-
error: status === "complete" ? null : describeError(error)
|
|
4344
|
-
};
|
|
4345
|
-
try {
|
|
4346
|
-
context.observer.modelCall(event);
|
|
4347
|
-
} catch (failure) {
|
|
4348
|
-
context.logError(
|
|
4349
|
-
`\u041D\u0430\u0431\u043B\u044E\u0434\u0430\u0442\u0435\u043B\u044C \u0445\u043E\u0434\u0430 \u043D\u0435 \u043F\u0440\u0438\u043D\u044F\u043B \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u043A \u043C\u043E\u0434\u0435\u043B\u0438 \u0432 \u0447\u0430\u0442\u0435 ${context.chatId}: ${failure instanceof Error ? failure.message : String(failure)}`,
|
|
4350
|
-
failure
|
|
4351
|
-
);
|
|
4352
|
-
}
|
|
4353
|
-
}
|
|
4354
|
-
};
|
|
4355
|
-
function finishOf(reason, spent) {
|
|
4356
|
-
response.finishReason = reason.unified;
|
|
4357
|
-
return { usage: usageOf(spent) };
|
|
4358
|
-
}
|
|
4359
|
-
}
|
|
4360
|
-
}
|
|
4361
|
-
function requestOf(params) {
|
|
4362
|
-
const { prompt, tools, headers: _headers, abortSignal: _abortSignal, includeRawChunks: _includeRawChunks, ...settings } = params;
|
|
4363
|
-
const [first, ...rest] = prompt;
|
|
4364
|
-
const hasInstructions = first?.role === "system";
|
|
4365
|
-
return {
|
|
4366
|
-
instructions: hasInstructions ? first : null,
|
|
4367
|
-
messages: hasInstructions ? rest : [...prompt],
|
|
4368
|
-
tools: (tools ?? []).map(
|
|
4369
|
-
(definition) => definition.type === "function" ? { name: definition.name, ...definition.description !== void 0 && { description: definition.description }, inputSchema: definition.inputSchema } : { name: definition.name, inputSchema: definition.args }
|
|
4370
|
-
),
|
|
4371
|
-
settings
|
|
4372
|
-
};
|
|
4373
|
-
}
|
|
4374
|
-
function toolCallOf(part) {
|
|
4375
|
-
return { toolCallId: part.toolCallId, toolName: part.toolName, input: parsedInput(part.input) };
|
|
4376
|
-
}
|
|
4377
|
-
function parsedInput(input) {
|
|
4378
|
-
try {
|
|
4379
|
-
return JSON.parse(input);
|
|
4380
|
-
} catch {
|
|
4381
|
-
return input;
|
|
4382
|
-
}
|
|
4383
|
-
}
|
|
4384
|
-
function usageOf(usage) {
|
|
4385
|
-
return {
|
|
4386
|
-
inputTokens: usage.inputTokens.total ?? 0,
|
|
4387
|
-
cachedInputTokens: usage.inputTokens.cacheRead ?? 0,
|
|
4388
|
-
cacheWriteTokens: usage.inputTokens.cacheWrite ?? 0,
|
|
4389
|
-
outputTokens: usage.outputTokens.total ?? 0,
|
|
4390
|
-
reasoningTokens: usage.outputTokens.reasoning ?? 0
|
|
4391
|
-
};
|
|
4392
|
-
}
|
|
4393
|
-
function describeError(error) {
|
|
4394
|
-
if (error instanceof Error) return error.message;
|
|
4395
|
-
if (error === void 0) return "\u043E\u0431\u0440\u044B\u0432 \u0431\u0435\u0437 \u043F\u0440\u0438\u0447\u0438\u043D\u044B";
|
|
4396
|
-
return typeof error === "string" ? error : String(error);
|
|
4397
|
-
}
|
|
4398
|
-
|
|
4399
|
-
// src/agent-run/turn-usage.ts
|
|
4400
|
-
import { asSchema } from "ai";
|
|
4401
|
-
var SHARES_PER_TOKEN = 6;
|
|
4402
|
-
var FILE_SHARES = 1600 * SHARES_PER_TOKEN;
|
|
4403
|
-
var tokensOf = (shares) => Math.ceil(shares / SHARES_PER_TOKEN);
|
|
4404
|
-
function textShares(text) {
|
|
4405
|
-
let shares = 0;
|
|
4406
|
-
for (let index = 0; index < text.length; index++) shares += charShares(text.charCodeAt(index));
|
|
4407
|
-
return shares;
|
|
4408
|
-
}
|
|
4409
|
-
function charShares(code) {
|
|
4410
|
-
if (code < 128) return isLatinLetterDigitOrSpace(code) ? 2 : 3;
|
|
4411
|
-
return isDenseScript(code) ? 6 : 3;
|
|
4412
|
-
}
|
|
4413
|
-
function isLatinLetterDigitOrSpace(code) {
|
|
4414
|
-
const isLetterOrDigit = code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122;
|
|
4415
|
-
return isLetterOrDigit || code === 32 || code === 10 || code === 9 || code === 13;
|
|
4416
|
-
}
|
|
4417
|
-
function isDenseScript(code) {
|
|
4418
|
-
return code >= 11904 && code <= 40959 || code >= 44032 && code <= 57343 || code >= 63744 && code <= 64255 || code >= 65280 && code <= 65519;
|
|
4419
|
-
}
|
|
4420
|
-
function estimateTextTokens(text) {
|
|
4421
|
-
return tokensOf(textShares(text));
|
|
4422
|
-
}
|
|
4423
|
-
function createTurnUsage(now = () => /* @__PURE__ */ new Date()) {
|
|
4424
|
-
const steps = [];
|
|
4425
|
-
let providerId = "";
|
|
4426
|
-
let fixedShares = 0;
|
|
4427
|
-
let requestShares = [];
|
|
4428
|
-
let requestTimes = [];
|
|
4429
|
-
let startedSteps = 0;
|
|
4430
|
-
let finishedSteps = 0;
|
|
4431
|
-
let written = { shares: 0, reasoningShares: 0, content: false };
|
|
4432
|
-
let generationIds = [];
|
|
4433
|
-
let requestOpen = false;
|
|
4434
|
-
let streamedCalls = /* @__PURE__ */ new Set();
|
|
4435
|
-
function estimate(stepIndex, shares, reasoningShares) {
|
|
4436
|
-
const previous = steps.findLast((step) => !step.erased)?.usage;
|
|
4437
|
-
const inputTokens = Math.max(tokensOf(requestShares[stepIndex] ?? fixedShares), previous ? previous.inputTokens + previous.outputTokens : 0);
|
|
4438
|
-
const cachedInputTokens = previous && previous.cachedInputTokens > 0 ? Math.min(previous.inputTokens, inputTokens) : 0;
|
|
4439
|
-
return {
|
|
4440
|
-
inputTokens,
|
|
4441
|
-
cachedInputTokens,
|
|
4442
|
-
outputTokens: tokensOf(shares + reasoningShares),
|
|
4443
|
-
reasoningTokens: tokensOf(reasoningShares),
|
|
4444
|
-
estimated: true
|
|
4445
|
-
};
|
|
4446
|
-
}
|
|
4447
|
-
function unfinishedStep() {
|
|
4448
|
-
const wroteSomething = startedSteps > finishedSteps && written.content;
|
|
4449
|
-
if (!wroteSomething && !requestOpen) return null;
|
|
4450
|
-
const index = wroteSomething ? startedSteps - 1 : finishedSteps;
|
|
4451
|
-
const usage = estimate(index, written.shares, written.reasoningShares);
|
|
4452
|
-
return { usage, providerId, generationIds, at: stepTime(index) };
|
|
4453
|
-
}
|
|
4454
|
-
function stepTime(index) {
|
|
4455
|
-
return requestTimes[index] ?? now().toISOString();
|
|
4456
|
-
}
|
|
4457
|
-
function nextStep() {
|
|
4458
|
-
written = { shares: 0, reasoningShares: 0, content: false };
|
|
4459
|
-
generationIds = [];
|
|
4460
|
-
requestOpen = false;
|
|
4461
|
-
}
|
|
4462
|
-
return {
|
|
4463
|
-
/** Новая попытка у провайдера `attemptProviderId`: инструкция и описания инструментов её запроса. */
|
|
4464
|
-
beginAttempt(request, attemptProviderId) {
|
|
4465
|
-
providerId = attemptProviderId;
|
|
4466
|
-
fixedShares = instructionsShares(request.instructions) + toolsShares(request.tools);
|
|
4467
|
-
requestShares = [];
|
|
4468
|
-
requestTimes = [];
|
|
4469
|
-
startedSteps = 0;
|
|
4470
|
-
finishedSteps = 0;
|
|
4471
|
-
nextStep();
|
|
4472
|
-
streamedCalls = /* @__PURE__ */ new Set();
|
|
4473
|
-
},
|
|
4474
|
-
/** Перед шагом попытки: сообщения его запроса. */
|
|
4475
|
-
beforeStep(stepNumber, messages) {
|
|
4476
|
-
requestShares[stepNumber] = fixedShares + messagesShares(messages);
|
|
4477
|
-
requestTimes[stepNumber] = now().toISOString();
|
|
4478
|
-
},
|
|
4479
|
-
/** Провайдер принял запрос идущего шага и начал поток: с этого мига вход оплачен (FR-051, FR-058). */
|
|
4480
|
-
requestOpened(request) {
|
|
4481
|
-
generationIds.push(request.generationId);
|
|
4482
|
-
requestOpen = true;
|
|
4483
|
-
},
|
|
4484
|
-
/** Провайдер сам отказал посреди потока: такой запрос не оплачивается. */
|
|
4485
|
-
requestRefused() {
|
|
4486
|
-
requestOpen = false;
|
|
4487
|
-
},
|
|
4488
|
-
/** Кусок UI-потока попытки: начала шагов и написанное. */
|
|
4489
|
-
observe(chunk) {
|
|
4490
|
-
if (chunk.type === "start-step") {
|
|
4491
|
-
startedSteps += 1;
|
|
4492
|
-
written = { shares: 0, reasoningShares: 0, content: false };
|
|
4493
|
-
return;
|
|
4494
|
-
}
|
|
4495
|
-
if (chunk.type === "text-delta") written.shares += textShares(chunk.delta);
|
|
4496
|
-
else if (chunk.type === "reasoning-delta") written.reasoningShares += textShares(chunk.delta);
|
|
4497
|
-
else if (chunk.type === "tool-input-delta") {
|
|
4498
|
-
streamedCalls.add(chunk.toolCallId);
|
|
4499
|
-
written.shares += textShares(chunk.inputTextDelta);
|
|
4500
|
-
} else if (chunk.type === "tool-input-available" && !streamedCalls.has(chunk.toolCallId)) {
|
|
4501
|
-
written.shares += textShares(JSON.stringify(chunk.input ?? null));
|
|
4502
|
-
} else if (!isWritten(chunk)) return;
|
|
4503
|
-
written.content = true;
|
|
4504
|
-
},
|
|
4505
|
-
/** Шаг завершён: числа провайдера или, если их нет, оценка. */
|
|
4506
|
-
finishStep(usage, content) {
|
|
4507
|
-
const index = finishedSteps;
|
|
4508
|
-
finishedSteps += 1;
|
|
4509
|
-
let stepUsage;
|
|
4510
|
-
if ((usage.inputTokens ?? 0) > 0 || (usage.outputTokens ?? 0) > 0) {
|
|
4511
|
-
stepUsage = emptyTokenUsage();
|
|
4512
|
-
addTokenUsage(stepUsage, usage);
|
|
4513
|
-
} else {
|
|
4514
|
-
const output = contentShares(content);
|
|
4515
|
-
stepUsage = estimate(index, output.shares, output.reasoningShares);
|
|
4516
|
-
}
|
|
4517
|
-
steps.push({ usage: stepUsage, providerId, generationIds, at: stepTime(index) });
|
|
4518
|
-
nextStep();
|
|
4519
|
-
},
|
|
4520
|
-
/** Шаг без запроса к провайдеру (готовый текст `endTurn`): в расход не идёт. */
|
|
4521
|
-
finishFreeStep() {
|
|
4522
|
-
finishedSteps += 1;
|
|
4523
|
-
nextStep();
|
|
4524
|
-
},
|
|
4525
|
-
/**
|
|
4526
|
-
* Попытка кончилась: недописанный шаг с написанным или с открытым запросом — в расход хода оценкой. `erased` — этот
|
|
4527
|
-
* шаг стёрт: оплачен, но следующий шаг его не видит.
|
|
4528
|
-
*/
|
|
4529
|
-
closeAttempt(options2 = {}) {
|
|
4530
|
-
const unfinished = unfinishedStep();
|
|
4531
|
-
if (unfinished) steps.push(options2.erased ? { ...unfinished, erased: true } : unfinished);
|
|
4532
|
-
finishedSteps = startedSteps;
|
|
4533
|
-
nextStep();
|
|
4534
|
-
},
|
|
4535
|
-
/** Расход каждого шага хода, без идущего. */
|
|
4536
|
-
steps() {
|
|
4537
|
-
return steps.map((step) => step.usage);
|
|
4538
|
-
},
|
|
4539
|
-
/** Шаги хода по провайдерам, в порядке первого шага у каждого: каждому — запись по его цене. */
|
|
4540
|
-
stepsByProvider() {
|
|
4541
|
-
const groups = /* @__PURE__ */ new Map();
|
|
4542
|
-
for (const step of steps) groups.set(step.providerId, [...groups.get(step.providerId) ?? [], { ...step.usage, at: step.at }]);
|
|
4543
|
-
return [...groups].map(([id, usages]) => ({ providerId: id, steps: usages }));
|
|
4544
|
-
},
|
|
4545
|
-
/**
|
|
4546
|
-
* Шаги, расход которых стоит узнать у провайдера (FR-058): оценённый — все его генерации; оплаченный по числам —
|
|
4547
|
-
* генерации до последней (повторы, оборванные до первого куска). Шаг с генерацией без номера не узнать — его нет.
|
|
4548
|
-
*/
|
|
4549
|
-
stepsToSettle() {
|
|
4550
|
-
return steps.flatMap((step) => {
|
|
4551
|
-
const ids = step.usage.estimated ? step.generationIds : step.generationIds.slice(0, -1);
|
|
4552
|
-
if (ids.length === 0 || !ids.every((id) => id !== void 0)) return [];
|
|
4553
|
-
return [{ providerId: step.providerId, at: step.at, estimate: step.usage.estimated ? step.usage : null, generationIds: ids }];
|
|
4554
|
-
});
|
|
4555
|
-
},
|
|
4556
|
-
/** Шаги хода с провайдерами вместе с оценкой идущего — в идущий ответ для восстановления (FR-052). */
|
|
4557
|
-
pendingSteps() {
|
|
4558
|
-
const unfinished = unfinishedStep();
|
|
4559
|
-
return (unfinished ? [...steps, unfinished] : steps).map((step) => ({ ...step.usage, providerId: step.providerId, at: step.at }));
|
|
4560
|
-
},
|
|
4561
|
-
/** Расход хода на этот момент вместе с оценкой идущего шага; ничего не потрачено — `null`. */
|
|
4562
|
-
total() {
|
|
4563
|
-
const unfinished = unfinishedStep();
|
|
4564
|
-
return sumOfSteps((unfinished ? [...steps, unfinished] : steps).map((step) => step.usage));
|
|
4565
|
-
}
|
|
4566
|
-
};
|
|
4567
|
-
}
|
|
4568
|
-
function sumOfSteps(steps) {
|
|
4569
|
-
const last = steps.at(-1);
|
|
4570
|
-
if (!last) return null;
|
|
4571
|
-
const total = emptyTokenUsage();
|
|
4572
|
-
for (const step of steps) {
|
|
4573
|
-
total.inputTokens += step.inputTokens;
|
|
4574
|
-
total.cachedInputTokens += step.cachedInputTokens;
|
|
4575
|
-
total.outputTokens += step.outputTokens;
|
|
4576
|
-
total.reasoningTokens += step.reasoningTokens;
|
|
4577
|
-
if (step.cacheWriteTokens) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + step.cacheWriteTokens;
|
|
4592
|
+
});
|
|
4593
|
+
function openCall(params, attempt) {
|
|
4594
|
+
const startedAtMs = now();
|
|
4595
|
+
const request = requestOf(params);
|
|
4596
|
+
const response = { text: "", reasoning: "", toolCalls: [], finishReason: null };
|
|
4597
|
+
let usage = null;
|
|
4598
|
+
let firstChunkMs = null;
|
|
4599
|
+
let settled2 = false;
|
|
4600
|
+
const firstChunk = () => {
|
|
4601
|
+
firstChunkMs ??= now() - startedAtMs;
|
|
4602
|
+
};
|
|
4603
|
+
return {
|
|
4604
|
+
firstChunk,
|
|
4605
|
+
collectPart(part) {
|
|
4606
|
+
if (part.type === "stream-start" || part.type === "response-metadata" || part.type === "raw") return;
|
|
4607
|
+
firstChunk();
|
|
4608
|
+
if (part.type === "text-delta") response.text += part.delta;
|
|
4609
|
+
else if (part.type === "reasoning-delta") response.reasoning += part.delta;
|
|
4610
|
+
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4611
|
+
else if (part.type === "finish") ({ usage } = finishOf(part.finishReason, part.usage));
|
|
4612
|
+
},
|
|
4613
|
+
collectContent(content) {
|
|
4614
|
+
for (const part of content) {
|
|
4615
|
+
if (part.type === "text") response.text += part.text;
|
|
4616
|
+
else if (part.type === "reasoning") response.reasoning += part.text;
|
|
4617
|
+
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4618
|
+
}
|
|
4619
|
+
},
|
|
4620
|
+
finish(reason, spent) {
|
|
4621
|
+
({ usage } = finishOf(reason, spent));
|
|
4622
|
+
},
|
|
4623
|
+
settle(status, error) {
|
|
4624
|
+
if (settled2) return;
|
|
4625
|
+
settled2 = true;
|
|
4626
|
+
const event = {
|
|
4627
|
+
callId: crypto.randomUUID(),
|
|
4628
|
+
chatId: context.chatId,
|
|
4629
|
+
ownerId: context.ownerId,
|
|
4630
|
+
messageId: context.messageId,
|
|
4631
|
+
purpose: context.purpose,
|
|
4632
|
+
attempt,
|
|
4633
|
+
modelId: context.modelId,
|
|
4634
|
+
providerId: context.providerId,
|
|
4635
|
+
request,
|
|
4636
|
+
response,
|
|
4637
|
+
usage,
|
|
4638
|
+
costUsd: usage && context.price ? costOfUsage(usage, context.price, new Date(startedAtMs)) : null,
|
|
4639
|
+
startedAt: new Date(startedAtMs),
|
|
4640
|
+
firstChunkMs,
|
|
4641
|
+
durationMs: now() - startedAtMs,
|
|
4642
|
+
status,
|
|
4643
|
+
error: status === "complete" ? null : describeError(error)
|
|
4644
|
+
};
|
|
4645
|
+
try {
|
|
4646
|
+
context.observer.modelCall(event);
|
|
4647
|
+
} catch (failure) {
|
|
4648
|
+
context.logError(
|
|
4649
|
+
`\u041D\u0430\u0431\u043B\u044E\u0434\u0430\u0442\u0435\u043B\u044C \u0445\u043E\u0434\u0430 \u043D\u0435 \u043F\u0440\u0438\u043D\u044F\u043B \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u043A \u043C\u043E\u0434\u0435\u043B\u0438 \u0432 \u0447\u0430\u0442\u0435 ${context.chatId}: ${failure instanceof Error ? failure.message : String(failure)}`,
|
|
4650
|
+
failure
|
|
4651
|
+
);
|
|
4652
|
+
}
|
|
4653
|
+
}
|
|
4654
|
+
};
|
|
4655
|
+
function finishOf(reason, spent) {
|
|
4656
|
+
response.finishReason = reason.unified;
|
|
4657
|
+
return { usage: usageOf(spent) };
|
|
4658
|
+
}
|
|
4578
4659
|
}
|
|
4579
|
-
const contextTokens = last.inputTokens + last.outputTokens;
|
|
4580
|
-
return { ...total, ...contextTokens > 0 && { contextTokens }, ...steps.some((step) => step.estimated) && { estimated: true } };
|
|
4581
|
-
}
|
|
4582
|
-
function isWritten(chunk) {
|
|
4583
|
-
return chunk.type.startsWith("source-") || chunk.type === "file" || chunk.type === "tool-approval-request" || chunk.type.startsWith("data-");
|
|
4584
4660
|
}
|
|
4585
|
-
function
|
|
4586
|
-
|
|
4587
|
-
|
|
4588
|
-
const
|
|
4589
|
-
return
|
|
4661
|
+
function requestOf(params) {
|
|
4662
|
+
const { prompt, tools, headers: _headers, abortSignal: _abortSignal, includeRawChunks: _includeRawChunks, ...settings } = params;
|
|
4663
|
+
const [first, ...rest] = prompt;
|
|
4664
|
+
const hasInstructions = first?.role === "system";
|
|
4665
|
+
return {
|
|
4666
|
+
instructions: hasInstructions ? first : null,
|
|
4667
|
+
messages: hasInstructions ? rest : [...prompt],
|
|
4668
|
+
tools: (tools ?? []).map(
|
|
4669
|
+
(definition) => definition.type === "function" ? { name: definition.name, ...definition.description !== void 0 && { description: definition.description }, inputSchema: definition.inputSchema } : { name: definition.name, inputSchema: definition.args }
|
|
4670
|
+
),
|
|
4671
|
+
settings
|
|
4672
|
+
};
|
|
4590
4673
|
}
|
|
4591
|
-
function
|
|
4592
|
-
|
|
4593
|
-
for (const [name, tool4] of Object.entries(tools ?? {})) {
|
|
4594
|
-
shares += textShares(name) + (typeof tool4.description === "string" ? textShares(tool4.description) : 0);
|
|
4595
|
-
const schema = tool4.inputSchema && asSchema(tool4.inputSchema).jsonSchema;
|
|
4596
|
-
if (schema && typeof schema.then !== "function") shares += textShares(JSON.stringify(schema));
|
|
4597
|
-
}
|
|
4598
|
-
return shares;
|
|
4674
|
+
function toolCallOf(part) {
|
|
4675
|
+
return { toolCallId: part.toolCallId, toolName: part.toolName, input: parsedInput(part.input) };
|
|
4599
4676
|
}
|
|
4600
|
-
function
|
|
4601
|
-
|
|
4602
|
-
|
|
4603
|
-
|
|
4604
|
-
|
|
4677
|
+
function parsedInput(input) {
|
|
4678
|
+
try {
|
|
4679
|
+
return JSON.parse(input);
|
|
4680
|
+
} catch {
|
|
4681
|
+
return input;
|
|
4605
4682
|
}
|
|
4606
|
-
return shares;
|
|
4607
4683
|
}
|
|
4608
|
-
function
|
|
4609
|
-
|
|
4610
|
-
|
|
4611
|
-
|
|
4612
|
-
|
|
4613
|
-
|
|
4614
|
-
|
|
4615
|
-
|
|
4616
|
-
case "tool-call":
|
|
4617
|
-
return textShares(part.toolName) + textShares(JSON.stringify(part.input ?? null));
|
|
4618
|
-
case "tool-result":
|
|
4619
|
-
return part.output.type === "content" ? part.output.value.reduce((sum, item) => sum + (item.type === "text" ? textShares(item.text) : FILE_SHARES), 0) : textShares(JSON.stringify(part.output));
|
|
4620
|
-
default:
|
|
4621
|
-
return textShares(JSON.stringify(part));
|
|
4622
|
-
}
|
|
4684
|
+
function usageOf(usage) {
|
|
4685
|
+
return {
|
|
4686
|
+
inputTokens: usage.inputTokens.total ?? 0,
|
|
4687
|
+
cachedInputTokens: usage.inputTokens.cacheRead ?? 0,
|
|
4688
|
+
cacheWriteTokens: usage.inputTokens.cacheWrite ?? 0,
|
|
4689
|
+
outputTokens: usage.outputTokens.total ?? 0,
|
|
4690
|
+
reasoningTokens: usage.outputTokens.reasoning ?? 0
|
|
4691
|
+
};
|
|
4623
4692
|
}
|
|
4624
|
-
function
|
|
4625
|
-
|
|
4626
|
-
|
|
4627
|
-
|
|
4628
|
-
if (part.type === "text") shares += textShares(part.text);
|
|
4629
|
-
else if (part.type === "reasoning") reasoningShares += textShares(part.text);
|
|
4630
|
-
else if (part.type === "tool-call") shares += textShares(JSON.stringify(part.input ?? null));
|
|
4631
|
-
}
|
|
4632
|
-
return { shares, reasoningShares };
|
|
4693
|
+
function describeError(error) {
|
|
4694
|
+
if (error instanceof Error) return error.message;
|
|
4695
|
+
if (error === void 0) return "\u043E\u0431\u0440\u044B\u0432 \u0431\u0435\u0437 \u043F\u0440\u0438\u0447\u0438\u043D\u044B";
|
|
4696
|
+
return typeof error === "string" ? error : String(error);
|
|
4633
4697
|
}
|
|
4634
4698
|
|
|
4635
4699
|
// src/agent-run/step-cache-mark.ts
|
|
@@ -6867,58 +6931,6 @@ async function* limitIterationResults(source, limited, reportCut, remember) {
|
|
|
6867
6931
|
reportCut(lastCutFrom);
|
|
6868
6932
|
}
|
|
6869
6933
|
|
|
6870
|
-
// src/agent-run/step-context.ts
|
|
6871
|
-
var DEFAULT_STEP_CONTEXT_TIMEOUT_MS = 5e3;
|
|
6872
|
-
function createStepSnapshots(options2) {
|
|
6873
|
-
let previous;
|
|
6874
|
-
return {
|
|
6875
|
-
async messagesFor({ messages, trailing, context }) {
|
|
6876
|
-
const withoutPrevious = previous ? messages.filter((message) => message !== previous) : messages;
|
|
6877
|
-
previous = void 0;
|
|
6878
|
-
const text = await snapshotText(options2, context);
|
|
6879
|
-
if (!text) return { messages: withoutPrevious, tokens: 0 };
|
|
6880
|
-
const snapshot = { role: "user", content: [{ type: "text", text }] };
|
|
6881
|
-
previous = snapshot;
|
|
6882
|
-
const at = withoutPrevious.length - Math.min(trailing, withoutPrevious.length);
|
|
6883
|
-
return { messages: [...withoutPrevious.slice(0, at), snapshot, ...withoutPrevious.slice(at)], tokens: estimateTextTokens(text) };
|
|
6884
|
-
}
|
|
6885
|
-
};
|
|
6886
|
-
}
|
|
6887
|
-
async function snapshotText(options2, context) {
|
|
6888
|
-
const timeoutMs = options2.timeoutMs ?? DEFAULT_STEP_CONTEXT_TIMEOUT_MS;
|
|
6889
|
-
const log = (message) => options2.logError(`[\u0441\u043D\u0438\u043C\u043E\u043A \u0448\u0430\u0433\u0430] \u0447\u0430\u0442=${options2.chatId} \u0448\u0430\u0433=${context.stepNumber} ${message}`);
|
|
6890
|
-
const stop = context.abortSignal;
|
|
6891
|
-
const ownAbort = new AbortController();
|
|
6892
|
-
let timer;
|
|
6893
|
-
let onStop;
|
|
6894
|
-
const cutOff = new Promise((resolve) => {
|
|
6895
|
-
if (Number.isFinite(timeoutMs)) timer = setTimeout(() => resolve("timeout"), timeoutMs);
|
|
6896
|
-
onStop = () => resolve("stopped");
|
|
6897
|
-
if (stop.aborted) onStop();
|
|
6898
|
-
else stop.addEventListener("abort", onStop, { once: true });
|
|
6899
|
-
});
|
|
6900
|
-
try {
|
|
6901
|
-
const call = Promise.resolve().then(() => options2.stepContext({ ...context, abortSignal: AbortSignal.any([stop, ownAbort.signal]) }));
|
|
6902
|
-
const outcome = await Promise.race([call.then((text2) => ({ text: text2 })), cutOff]);
|
|
6903
|
-
if (outcome === "stopped") return null;
|
|
6904
|
-
if (outcome === "timeout") {
|
|
6905
|
-
ownAbort.abort(new Error(`stepContext \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`));
|
|
6906
|
-
log(`\u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`);
|
|
6907
|
-
return null;
|
|
6908
|
-
}
|
|
6909
|
-
const { text } = outcome;
|
|
6910
|
-
if (text === null || text === void 0 || text === "") return null;
|
|
6911
|
-
if (typeof text !== "string") throw new TypeError(`stepContext \u0432\u0435\u0440\u043D\u0443\u043B ${typeof text}, \u0430 \u043D\u0435 \u0441\u0442\u0440\u043E\u043A\u0443`);
|
|
6912
|
-
return text;
|
|
6913
|
-
} catch (error) {
|
|
6914
|
-
log(error instanceof Error ? error.message : String(error));
|
|
6915
|
-
return null;
|
|
6916
|
-
} finally {
|
|
6917
|
-
clearTimeout(timer);
|
|
6918
|
-
stop.removeEventListener("abort", onStop);
|
|
6919
|
-
}
|
|
6920
|
-
}
|
|
6921
|
-
|
|
6922
6934
|
// src/agent-run/turn-attempt.ts
|
|
6923
6935
|
var SERVICE_CHUNKS = /* @__PURE__ */ new Set(["start", "start-step"]);
|
|
6924
6936
|
function isContent(chunk) {
|
|
@@ -16072,4 +16084,4 @@ export {
|
|
|
16072
16084
|
InvalidWidgetAnswerError,
|
|
16073
16085
|
createChatService
|
|
16074
16086
|
};
|
|
16075
|
-
//# sourceMappingURL=chunk-
|
|
16087
|
+
//# sourceMappingURL=chunk-2MVJW2PT.js.map
|