@ykurilov/agent-chat-core 0.107.2 → 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 +27 -0
- package/README.md +1 -1
- package/dist/{chunk-D3PW7DT4.js → chunk-2MVJW2PT.js} +513 -387
- package/dist/chunk-2MVJW2PT.js.map +1 -0
- package/dist/index.js +18 -1
- package/dist/index.js.map +1 -1
- package/dist/storage-contract.js +53 -1
- package/dist/storage-contract.js.map +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 +14 -4
- package/dist/types/index.d.ts +3 -2
- package/dist/types/page-context/page-context.d.ts +8 -1
- package/dist/types/running-answers/stop-requests.d.ts +38 -0
- package/dist/types/storage/chat-storage.d.ts +25 -0
- package/dist/types/storage/storage-contract.d.ts +2 -0
- package/package.json +1 -1
- package/dist/chunk-D3PW7DT4.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]+»)*\]$/ },
|
|
@@ -2902,6 +3218,9 @@ async function hasChatMessages(storage, chatId) {
|
|
|
2902
3218
|
}
|
|
2903
3219
|
|
|
2904
3220
|
// src/page-context/page-context.ts
|
|
3221
|
+
function isTurnRequestId(value) {
|
|
3222
|
+
return typeof value === "string" && /^[A-Za-z0-9_.:-]{1,100}$/.test(value);
|
|
3223
|
+
}
|
|
2905
3224
|
function continuationRequestContext(start, corrections) {
|
|
2906
3225
|
const last = corrections.at(-1) ?? start;
|
|
2907
3226
|
if (last === void 0) return void 0;
|
|
@@ -2909,7 +3228,10 @@ function continuationRequestContext(start, corrections) {
|
|
|
2909
3228
|
return {
|
|
2910
3229
|
...place !== void 0 && { place },
|
|
2911
3230
|
...last.tabId !== void 0 && { tabId: last.tabId },
|
|
2912
|
-
...last.timeZone !== void 0 && { timeZone: last.timeZone }
|
|
3231
|
+
...last.timeZone !== void 0 && { timeZone: last.timeZone },
|
|
3232
|
+
// Продолжение — новый ответ, на последнюю поправку: id её запроса. «Стоп» прежнего ответа его не трогает (на любой
|
|
3233
|
+
// копии сервера), «Стоп» с id поправки — останавливает.
|
|
3234
|
+
...corrections.at(-1)?.turnRequestId !== void 0 && { turnRequestId: corrections.at(-1).turnRequestId }
|
|
2913
3235
|
};
|
|
2914
3236
|
}
|
|
2915
3237
|
var APP_CHANGE_PART_TYPE = "data-app-change";
|
|
@@ -3420,22 +3742,6 @@ async function resolveViewerOutsideTurn(source, turn, signal) {
|
|
|
3420
3742
|
// src/helpers/run-helper.ts
|
|
3421
3743
|
import { generateText as generateText2, stepCountIs as stepCountIs2 } from "ai";
|
|
3422
3744
|
|
|
3423
|
-
// src/conversation/token-usage.ts
|
|
3424
|
-
function emptyTokenUsage() {
|
|
3425
|
-
return { inputTokens: 0, cachedInputTokens: 0, outputTokens: 0, reasoningTokens: 0 };
|
|
3426
|
-
}
|
|
3427
|
-
function addTokenUsage(total, usage) {
|
|
3428
|
-
total.inputTokens += usage.inputTokens ?? 0;
|
|
3429
|
-
total.cachedInputTokens += usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
3430
|
-
total.outputTokens += usage.outputTokens ?? 0;
|
|
3431
|
-
total.reasoningTokens += usage.outputTokenDetails?.reasoningTokens ?? 0;
|
|
3432
|
-
const cacheWrite = usage.inputTokenDetails?.cacheWriteTokens ?? 0;
|
|
3433
|
-
if (cacheWrite > 0) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + cacheWrite;
|
|
3434
|
-
}
|
|
3435
|
-
function isEmptyTokenUsage(usage) {
|
|
3436
|
-
return usage.inputTokens === 0 && usage.outputTokens === 0 && usage.reasoningTokens === 0 && (usage.cacheWriteTokens ?? 0) === 0;
|
|
3437
|
-
}
|
|
3438
|
-
|
|
3439
3745
|
// src/provider-errors/error-signs.ts
|
|
3440
3746
|
var signs = (patterns) => new RegExp(patterns.join("|"), "i");
|
|
3441
3747
|
var OVERFLOW_SIGNS = [
|
|
@@ -4299,331 +4605,95 @@ function observeModelCalls(model, context) {
|
|
|
4299
4605
|
collectPart(part) {
|
|
4300
4606
|
if (part.type === "stream-start" || part.type === "response-metadata" || part.type === "raw") return;
|
|
4301
4607
|
firstChunk();
|
|
4302
|
-
if (part.type === "text-delta") response.text += part.delta;
|
|
4303
|
-
else if (part.type === "reasoning-delta") response.reasoning += part.delta;
|
|
4304
|
-
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4305
|
-
else if (part.type === "finish") ({ usage } = finishOf(part.finishReason, part.usage));
|
|
4306
|
-
},
|
|
4307
|
-
collectContent(content) {
|
|
4308
|
-
for (const part of content) {
|
|
4309
|
-
if (part.type === "text") response.text += part.text;
|
|
4310
|
-
else if (part.type === "reasoning") response.reasoning += part.text;
|
|
4311
|
-
else if (part.type === "tool-call") response.toolCalls.push(toolCallOf(part));
|
|
4312
|
-
}
|
|
4313
|
-
},
|
|
4314
|
-
finish(reason, spent) {
|
|
4315
|
-
({ usage } = finishOf(reason, spent));
|
|
4316
|
-
},
|
|
4317
|
-
settle(status, error) {
|
|
4318
|
-
if (settled2) return;
|
|
4319
|
-
settled2 = true;
|
|
4320
|
-
const event = {
|
|
4321
|
-
callId: crypto.randomUUID(),
|
|
4322
|
-
chatId: context.chatId,
|
|
4323
|
-
ownerId: context.ownerId,
|
|
4324
|
-
messageId: context.messageId,
|
|
4325
|
-
purpose: context.purpose,
|
|
4326
|
-
attempt,
|
|
4327
|
-
modelId: context.modelId,
|
|
4328
|
-
providerId: context.providerId,
|
|
4329
|
-
request,
|
|
4330
|
-
response,
|
|
4331
|
-
usage,
|
|
4332
|
-
costUsd: usage && context.price ? costOfUsage(usage, context.price, new Date(startedAtMs)) : null,
|
|
4333
|
-
startedAt: new Date(startedAtMs),
|
|
4334
|
-
firstChunkMs,
|
|
4335
|
-
durationMs: now() - startedAtMs,
|
|
4336
|
-
status,
|
|
4337
|
-
error: status === "complete" ? null : describeError(error)
|
|
4338
|
-
};
|
|
4339
|
-
try {
|
|
4340
|
-
context.observer.modelCall(event);
|
|
4341
|
-
} catch (failure) {
|
|
4342
|
-
context.logError(
|
|
4343
|
-
`\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)}`,
|
|
4344
|
-
failure
|
|
4345
|
-
);
|
|
4346
|
-
}
|
|
4347
|
-
}
|
|
4348
|
-
};
|
|
4349
|
-
function finishOf(reason, spent) {
|
|
4350
|
-
response.finishReason = reason.unified;
|
|
4351
|
-
return { usage: usageOf(spent) };
|
|
4352
|
-
}
|
|
4353
|
-
}
|
|
4354
|
-
}
|
|
4355
|
-
function requestOf(params) {
|
|
4356
|
-
const { prompt, tools, headers: _headers, abortSignal: _abortSignal, includeRawChunks: _includeRawChunks, ...settings } = params;
|
|
4357
|
-
const [first, ...rest] = prompt;
|
|
4358
|
-
const hasInstructions = first?.role === "system";
|
|
4359
|
-
return {
|
|
4360
|
-
instructions: hasInstructions ? first : null,
|
|
4361
|
-
messages: hasInstructions ? rest : [...prompt],
|
|
4362
|
-
tools: (tools ?? []).map(
|
|
4363
|
-
(definition) => definition.type === "function" ? { name: definition.name, ...definition.description !== void 0 && { description: definition.description }, inputSchema: definition.inputSchema } : { name: definition.name, inputSchema: definition.args }
|
|
4364
|
-
),
|
|
4365
|
-
settings
|
|
4366
|
-
};
|
|
4367
|
-
}
|
|
4368
|
-
function toolCallOf(part) {
|
|
4369
|
-
return { toolCallId: part.toolCallId, toolName: part.toolName, input: parsedInput(part.input) };
|
|
4370
|
-
}
|
|
4371
|
-
function parsedInput(input) {
|
|
4372
|
-
try {
|
|
4373
|
-
return JSON.parse(input);
|
|
4374
|
-
} catch {
|
|
4375
|
-
return input;
|
|
4376
|
-
}
|
|
4377
|
-
}
|
|
4378
|
-
function usageOf(usage) {
|
|
4379
|
-
return {
|
|
4380
|
-
inputTokens: usage.inputTokens.total ?? 0,
|
|
4381
|
-
cachedInputTokens: usage.inputTokens.cacheRead ?? 0,
|
|
4382
|
-
cacheWriteTokens: usage.inputTokens.cacheWrite ?? 0,
|
|
4383
|
-
outputTokens: usage.outputTokens.total ?? 0,
|
|
4384
|
-
reasoningTokens: usage.outputTokens.reasoning ?? 0
|
|
4385
|
-
};
|
|
4386
|
-
}
|
|
4387
|
-
function describeError(error) {
|
|
4388
|
-
if (error instanceof Error) return error.message;
|
|
4389
|
-
if (error === void 0) return "\u043E\u0431\u0440\u044B\u0432 \u0431\u0435\u0437 \u043F\u0440\u0438\u0447\u0438\u043D\u044B";
|
|
4390
|
-
return typeof error === "string" ? error : String(error);
|
|
4391
|
-
}
|
|
4392
|
-
|
|
4393
|
-
// src/agent-run/turn-usage.ts
|
|
4394
|
-
import { asSchema } from "ai";
|
|
4395
|
-
var SHARES_PER_TOKEN = 6;
|
|
4396
|
-
var FILE_SHARES = 1600 * SHARES_PER_TOKEN;
|
|
4397
|
-
var tokensOf = (shares) => Math.ceil(shares / SHARES_PER_TOKEN);
|
|
4398
|
-
function textShares(text) {
|
|
4399
|
-
let shares = 0;
|
|
4400
|
-
for (let index = 0; index < text.length; index++) shares += charShares(text.charCodeAt(index));
|
|
4401
|
-
return shares;
|
|
4402
|
-
}
|
|
4403
|
-
function charShares(code) {
|
|
4404
|
-
if (code < 128) return isLatinLetterDigitOrSpace(code) ? 2 : 3;
|
|
4405
|
-
return isDenseScript(code) ? 6 : 3;
|
|
4406
|
-
}
|
|
4407
|
-
function isLatinLetterDigitOrSpace(code) {
|
|
4408
|
-
const isLetterOrDigit = code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122;
|
|
4409
|
-
return isLetterOrDigit || code === 32 || code === 10 || code === 9 || code === 13;
|
|
4410
|
-
}
|
|
4411
|
-
function isDenseScript(code) {
|
|
4412
|
-
return code >= 11904 && code <= 40959 || code >= 44032 && code <= 57343 || code >= 63744 && code <= 64255 || code >= 65280 && code <= 65519;
|
|
4413
|
-
}
|
|
4414
|
-
function estimateTextTokens(text) {
|
|
4415
|
-
return tokensOf(textShares(text));
|
|
4416
|
-
}
|
|
4417
|
-
function createTurnUsage(now = () => /* @__PURE__ */ new Date()) {
|
|
4418
|
-
const steps = [];
|
|
4419
|
-
let providerId = "";
|
|
4420
|
-
let fixedShares = 0;
|
|
4421
|
-
let requestShares = [];
|
|
4422
|
-
let requestTimes = [];
|
|
4423
|
-
let startedSteps = 0;
|
|
4424
|
-
let finishedSteps = 0;
|
|
4425
|
-
let written = { shares: 0, reasoningShares: 0, content: false };
|
|
4426
|
-
let generationIds = [];
|
|
4427
|
-
let requestOpen = false;
|
|
4428
|
-
let streamedCalls = /* @__PURE__ */ new Set();
|
|
4429
|
-
function estimate(stepIndex, shares, reasoningShares) {
|
|
4430
|
-
const previous = steps.findLast((step) => !step.erased)?.usage;
|
|
4431
|
-
const inputTokens = Math.max(tokensOf(requestShares[stepIndex] ?? fixedShares), previous ? previous.inputTokens + previous.outputTokens : 0);
|
|
4432
|
-
const cachedInputTokens = previous && previous.cachedInputTokens > 0 ? Math.min(previous.inputTokens, inputTokens) : 0;
|
|
4433
|
-
return {
|
|
4434
|
-
inputTokens,
|
|
4435
|
-
cachedInputTokens,
|
|
4436
|
-
outputTokens: tokensOf(shares + reasoningShares),
|
|
4437
|
-
reasoningTokens: tokensOf(reasoningShares),
|
|
4438
|
-
estimated: true
|
|
4439
|
-
};
|
|
4440
|
-
}
|
|
4441
|
-
function unfinishedStep() {
|
|
4442
|
-
const wroteSomething = startedSteps > finishedSteps && written.content;
|
|
4443
|
-
if (!wroteSomething && !requestOpen) return null;
|
|
4444
|
-
const index = wroteSomething ? startedSteps - 1 : finishedSteps;
|
|
4445
|
-
const usage = estimate(index, written.shares, written.reasoningShares);
|
|
4446
|
-
return { usage, providerId, generationIds, at: stepTime(index) };
|
|
4447
|
-
}
|
|
4448
|
-
function stepTime(index) {
|
|
4449
|
-
return requestTimes[index] ?? now().toISOString();
|
|
4450
|
-
}
|
|
4451
|
-
function nextStep() {
|
|
4452
|
-
written = { shares: 0, reasoningShares: 0, content: false };
|
|
4453
|
-
generationIds = [];
|
|
4454
|
-
requestOpen = false;
|
|
4455
|
-
}
|
|
4456
|
-
return {
|
|
4457
|
-
/** Новая попытка у провайдера `attemptProviderId`: инструкция и описания инструментов её запроса. */
|
|
4458
|
-
beginAttempt(request, attemptProviderId) {
|
|
4459
|
-
providerId = attemptProviderId;
|
|
4460
|
-
fixedShares = instructionsShares(request.instructions) + toolsShares(request.tools);
|
|
4461
|
-
requestShares = [];
|
|
4462
|
-
requestTimes = [];
|
|
4463
|
-
startedSteps = 0;
|
|
4464
|
-
finishedSteps = 0;
|
|
4465
|
-
nextStep();
|
|
4466
|
-
streamedCalls = /* @__PURE__ */ new Set();
|
|
4467
|
-
},
|
|
4468
|
-
/** Перед шагом попытки: сообщения его запроса. */
|
|
4469
|
-
beforeStep(stepNumber, messages) {
|
|
4470
|
-
requestShares[stepNumber] = fixedShares + messagesShares(messages);
|
|
4471
|
-
requestTimes[stepNumber] = now().toISOString();
|
|
4472
|
-
},
|
|
4473
|
-
/** Провайдер принял запрос идущего шага и начал поток: с этого мига вход оплачен (FR-051, FR-058). */
|
|
4474
|
-
requestOpened(request) {
|
|
4475
|
-
generationIds.push(request.generationId);
|
|
4476
|
-
requestOpen = true;
|
|
4477
|
-
},
|
|
4478
|
-
/** Провайдер сам отказал посреди потока: такой запрос не оплачивается. */
|
|
4479
|
-
requestRefused() {
|
|
4480
|
-
requestOpen = false;
|
|
4481
|
-
},
|
|
4482
|
-
/** Кусок UI-потока попытки: начала шагов и написанное. */
|
|
4483
|
-
observe(chunk) {
|
|
4484
|
-
if (chunk.type === "start-step") {
|
|
4485
|
-
startedSteps += 1;
|
|
4486
|
-
written = { shares: 0, reasoningShares: 0, content: false };
|
|
4487
|
-
return;
|
|
4488
|
-
}
|
|
4489
|
-
if (chunk.type === "text-delta") written.shares += textShares(chunk.delta);
|
|
4490
|
-
else if (chunk.type === "reasoning-delta") written.reasoningShares += textShares(chunk.delta);
|
|
4491
|
-
else if (chunk.type === "tool-input-delta") {
|
|
4492
|
-
streamedCalls.add(chunk.toolCallId);
|
|
4493
|
-
written.shares += textShares(chunk.inputTextDelta);
|
|
4494
|
-
} else if (chunk.type === "tool-input-available" && !streamedCalls.has(chunk.toolCallId)) {
|
|
4495
|
-
written.shares += textShares(JSON.stringify(chunk.input ?? null));
|
|
4496
|
-
} else if (!isWritten(chunk)) return;
|
|
4497
|
-
written.content = true;
|
|
4498
|
-
},
|
|
4499
|
-
/** Шаг завершён: числа провайдера или, если их нет, оценка. */
|
|
4500
|
-
finishStep(usage, content) {
|
|
4501
|
-
const index = finishedSteps;
|
|
4502
|
-
finishedSteps += 1;
|
|
4503
|
-
let stepUsage;
|
|
4504
|
-
if ((usage.inputTokens ?? 0) > 0 || (usage.outputTokens ?? 0) > 0) {
|
|
4505
|
-
stepUsage = emptyTokenUsage();
|
|
4506
|
-
addTokenUsage(stepUsage, usage);
|
|
4507
|
-
} else {
|
|
4508
|
-
const output = contentShares(content);
|
|
4509
|
-
stepUsage = estimate(index, output.shares, output.reasoningShares);
|
|
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
|
+
}
|
|
4510
4653
|
}
|
|
4511
|
-
|
|
4512
|
-
|
|
4513
|
-
|
|
4514
|
-
|
|
4515
|
-
finishFreeStep() {
|
|
4516
|
-
finishedSteps += 1;
|
|
4517
|
-
nextStep();
|
|
4518
|
-
},
|
|
4519
|
-
/**
|
|
4520
|
-
* Попытка кончилась: недописанный шаг с написанным или с открытым запросом — в расход хода оценкой. `erased` — этот
|
|
4521
|
-
* шаг стёрт: оплачен, но следующий шаг его не видит.
|
|
4522
|
-
*/
|
|
4523
|
-
closeAttempt(options2 = {}) {
|
|
4524
|
-
const unfinished = unfinishedStep();
|
|
4525
|
-
if (unfinished) steps.push(options2.erased ? { ...unfinished, erased: true } : unfinished);
|
|
4526
|
-
finishedSteps = startedSteps;
|
|
4527
|
-
nextStep();
|
|
4528
|
-
},
|
|
4529
|
-
/** Расход каждого шага хода, без идущего. */
|
|
4530
|
-
steps() {
|
|
4531
|
-
return steps.map((step) => step.usage);
|
|
4532
|
-
},
|
|
4533
|
-
/** Шаги хода по провайдерам, в порядке первого шага у каждого: каждому — запись по его цене. */
|
|
4534
|
-
stepsByProvider() {
|
|
4535
|
-
const groups = /* @__PURE__ */ new Map();
|
|
4536
|
-
for (const step of steps) groups.set(step.providerId, [...groups.get(step.providerId) ?? [], { ...step.usage, at: step.at }]);
|
|
4537
|
-
return [...groups].map(([id, usages]) => ({ providerId: id, steps: usages }));
|
|
4538
|
-
},
|
|
4539
|
-
/**
|
|
4540
|
-
* Шаги, расход которых стоит узнать у провайдера (FR-058): оценённый — все его генерации; оплаченный по числам —
|
|
4541
|
-
* генерации до последней (повторы, оборванные до первого куска). Шаг с генерацией без номера не узнать — его нет.
|
|
4542
|
-
*/
|
|
4543
|
-
stepsToSettle() {
|
|
4544
|
-
return steps.flatMap((step) => {
|
|
4545
|
-
const ids = step.usage.estimated ? step.generationIds : step.generationIds.slice(0, -1);
|
|
4546
|
-
if (ids.length === 0 || !ids.every((id) => id !== void 0)) return [];
|
|
4547
|
-
return [{ providerId: step.providerId, at: step.at, estimate: step.usage.estimated ? step.usage : null, generationIds: ids }];
|
|
4548
|
-
});
|
|
4549
|
-
},
|
|
4550
|
-
/** Шаги хода с провайдерами вместе с оценкой идущего — в идущий ответ для восстановления (FR-052). */
|
|
4551
|
-
pendingSteps() {
|
|
4552
|
-
const unfinished = unfinishedStep();
|
|
4553
|
-
return (unfinished ? [...steps, unfinished] : steps).map((step) => ({ ...step.usage, providerId: step.providerId, at: step.at }));
|
|
4554
|
-
},
|
|
4555
|
-
/** Расход хода на этот момент вместе с оценкой идущего шага; ничего не потрачено — `null`. */
|
|
4556
|
-
total() {
|
|
4557
|
-
const unfinished = unfinishedStep();
|
|
4558
|
-
return sumOfSteps((unfinished ? [...steps, unfinished] : steps).map((step) => step.usage));
|
|
4654
|
+
};
|
|
4655
|
+
function finishOf(reason, spent) {
|
|
4656
|
+
response.finishReason = reason.unified;
|
|
4657
|
+
return { usage: usageOf(spent) };
|
|
4559
4658
|
}
|
|
4560
|
-
};
|
|
4561
|
-
}
|
|
4562
|
-
function sumOfSteps(steps) {
|
|
4563
|
-
const last = steps.at(-1);
|
|
4564
|
-
if (!last) return null;
|
|
4565
|
-
const total = emptyTokenUsage();
|
|
4566
|
-
for (const step of steps) {
|
|
4567
|
-
total.inputTokens += step.inputTokens;
|
|
4568
|
-
total.cachedInputTokens += step.cachedInputTokens;
|
|
4569
|
-
total.outputTokens += step.outputTokens;
|
|
4570
|
-
total.reasoningTokens += step.reasoningTokens;
|
|
4571
|
-
if (step.cacheWriteTokens) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + step.cacheWriteTokens;
|
|
4572
4659
|
}
|
|
4573
|
-
const contextTokens = last.inputTokens + last.outputTokens;
|
|
4574
|
-
return { ...total, ...contextTokens > 0 && { contextTokens }, ...steps.some((step) => step.estimated) && { estimated: true } };
|
|
4575
|
-
}
|
|
4576
|
-
function isWritten(chunk) {
|
|
4577
|
-
return chunk.type.startsWith("source-") || chunk.type === "file" || chunk.type === "tool-approval-request" || chunk.type.startsWith("data-");
|
|
4578
4660
|
}
|
|
4579
|
-
function
|
|
4580
|
-
|
|
4581
|
-
|
|
4582
|
-
const
|
|
4583
|
-
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
|
+
};
|
|
4584
4673
|
}
|
|
4585
|
-
function
|
|
4586
|
-
|
|
4587
|
-
for (const [name, tool4] of Object.entries(tools ?? {})) {
|
|
4588
|
-
shares += textShares(name) + (typeof tool4.description === "string" ? textShares(tool4.description) : 0);
|
|
4589
|
-
const schema = tool4.inputSchema && asSchema(tool4.inputSchema).jsonSchema;
|
|
4590
|
-
if (schema && typeof schema.then !== "function") shares += textShares(JSON.stringify(schema));
|
|
4591
|
-
}
|
|
4592
|
-
return shares;
|
|
4674
|
+
function toolCallOf(part) {
|
|
4675
|
+
return { toolCallId: part.toolCallId, toolName: part.toolName, input: parsedInput(part.input) };
|
|
4593
4676
|
}
|
|
4594
|
-
function
|
|
4595
|
-
|
|
4596
|
-
|
|
4597
|
-
|
|
4598
|
-
|
|
4677
|
+
function parsedInput(input) {
|
|
4678
|
+
try {
|
|
4679
|
+
return JSON.parse(input);
|
|
4680
|
+
} catch {
|
|
4681
|
+
return input;
|
|
4599
4682
|
}
|
|
4600
|
-
return shares;
|
|
4601
4683
|
}
|
|
4602
|
-
function
|
|
4603
|
-
|
|
4604
|
-
|
|
4605
|
-
|
|
4606
|
-
|
|
4607
|
-
|
|
4608
|
-
|
|
4609
|
-
|
|
4610
|
-
case "tool-call":
|
|
4611
|
-
return textShares(part.toolName) + textShares(JSON.stringify(part.input ?? null));
|
|
4612
|
-
case "tool-result":
|
|
4613
|
-
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));
|
|
4614
|
-
default:
|
|
4615
|
-
return textShares(JSON.stringify(part));
|
|
4616
|
-
}
|
|
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
|
+
};
|
|
4617
4692
|
}
|
|
4618
|
-
function
|
|
4619
|
-
|
|
4620
|
-
|
|
4621
|
-
|
|
4622
|
-
if (part.type === "text") shares += textShares(part.text);
|
|
4623
|
-
else if (part.type === "reasoning") reasoningShares += textShares(part.text);
|
|
4624
|
-
else if (part.type === "tool-call") shares += textShares(JSON.stringify(part.input ?? null));
|
|
4625
|
-
}
|
|
4626
|
-
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);
|
|
4627
4697
|
}
|
|
4628
4698
|
|
|
4629
4699
|
// src/agent-run/step-cache-mark.ts
|
|
@@ -6861,58 +6931,6 @@ async function* limitIterationResults(source, limited, reportCut, remember) {
|
|
|
6861
6931
|
reportCut(lastCutFrom);
|
|
6862
6932
|
}
|
|
6863
6933
|
|
|
6864
|
-
// src/agent-run/step-context.ts
|
|
6865
|
-
var DEFAULT_STEP_CONTEXT_TIMEOUT_MS = 5e3;
|
|
6866
|
-
function createStepSnapshots(options2) {
|
|
6867
|
-
let previous;
|
|
6868
|
-
return {
|
|
6869
|
-
async messagesFor({ messages, trailing, context }) {
|
|
6870
|
-
const withoutPrevious = previous ? messages.filter((message) => message !== previous) : messages;
|
|
6871
|
-
previous = void 0;
|
|
6872
|
-
const text = await snapshotText(options2, context);
|
|
6873
|
-
if (!text) return { messages: withoutPrevious, tokens: 0 };
|
|
6874
|
-
const snapshot = { role: "user", content: [{ type: "text", text }] };
|
|
6875
|
-
previous = snapshot;
|
|
6876
|
-
const at = withoutPrevious.length - Math.min(trailing, withoutPrevious.length);
|
|
6877
|
-
return { messages: [...withoutPrevious.slice(0, at), snapshot, ...withoutPrevious.slice(at)], tokens: estimateTextTokens(text) };
|
|
6878
|
-
}
|
|
6879
|
-
};
|
|
6880
|
-
}
|
|
6881
|
-
async function snapshotText(options2, context) {
|
|
6882
|
-
const timeoutMs = options2.timeoutMs ?? DEFAULT_STEP_CONTEXT_TIMEOUT_MS;
|
|
6883
|
-
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}`);
|
|
6884
|
-
const stop = context.abortSignal;
|
|
6885
|
-
const ownAbort = new AbortController();
|
|
6886
|
-
let timer;
|
|
6887
|
-
let onStop;
|
|
6888
|
-
const cutOff = new Promise((resolve) => {
|
|
6889
|
-
if (Number.isFinite(timeoutMs)) timer = setTimeout(() => resolve("timeout"), timeoutMs);
|
|
6890
|
-
onStop = () => resolve("stopped");
|
|
6891
|
-
if (stop.aborted) onStop();
|
|
6892
|
-
else stop.addEventListener("abort", onStop, { once: true });
|
|
6893
|
-
});
|
|
6894
|
-
try {
|
|
6895
|
-
const call = Promise.resolve().then(() => options2.stepContext({ ...context, abortSignal: AbortSignal.any([stop, ownAbort.signal]) }));
|
|
6896
|
-
const outcome = await Promise.race([call.then((text2) => ({ text: text2 })), cutOff]);
|
|
6897
|
-
if (outcome === "stopped") return null;
|
|
6898
|
-
if (outcome === "timeout") {
|
|
6899
|
-
ownAbort.abort(new Error(`stepContext \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`));
|
|
6900
|
-
log(`\u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs} \u043C\u0441`);
|
|
6901
|
-
return null;
|
|
6902
|
-
}
|
|
6903
|
-
const { text } = outcome;
|
|
6904
|
-
if (text === null || text === void 0 || text === "") return null;
|
|
6905
|
-
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`);
|
|
6906
|
-
return text;
|
|
6907
|
-
} catch (error) {
|
|
6908
|
-
log(error instanceof Error ? error.message : String(error));
|
|
6909
|
-
return null;
|
|
6910
|
-
} finally {
|
|
6911
|
-
clearTimeout(timer);
|
|
6912
|
-
stop.removeEventListener("abort", onStop);
|
|
6913
|
-
}
|
|
6914
|
-
}
|
|
6915
|
-
|
|
6916
6934
|
// src/agent-run/turn-attempt.ts
|
|
6917
6935
|
var SERVICE_CHUNKS = /* @__PURE__ */ new Set(["start", "start-step"]);
|
|
6918
6936
|
function isContent(chunk) {
|
|
@@ -10573,6 +10591,102 @@ function createRunningAnswerRegistry() {
|
|
|
10573
10591
|
};
|
|
10574
10592
|
}
|
|
10575
10593
|
|
|
10594
|
+
// src/running-answers/stop-requests.ts
|
|
10595
|
+
var STOP_REQUESTS_CHECK_EVERY_MS = 2e3;
|
|
10596
|
+
var STOP_REQUEST_KEEP_MS = 60 * 60 * 1e3;
|
|
10597
|
+
var STOP_REQUESTS_PER_OWNER = 100;
|
|
10598
|
+
function createStopRequests(input) {
|
|
10599
|
+
const { storage, now, logError } = input;
|
|
10600
|
+
const remembered = /* @__PURE__ */ new Map();
|
|
10601
|
+
const byOwner = /* @__PURE__ */ new Map();
|
|
10602
|
+
const watched = /* @__PURE__ */ new Map();
|
|
10603
|
+
const keyOf = (chatId, turnRequestId) => JSON.stringify([chatId, turnRequestId]);
|
|
10604
|
+
function forget(key) {
|
|
10605
|
+
const entry = remembered.get(key);
|
|
10606
|
+
if (!entry) return;
|
|
10607
|
+
remembered.delete(key);
|
|
10608
|
+
const keys = byOwner.get(entry.ownerId);
|
|
10609
|
+
keys.splice(keys.indexOf(key), 1);
|
|
10610
|
+
if (keys.length === 0) byOwner.delete(entry.ownerId);
|
|
10611
|
+
}
|
|
10612
|
+
function forgetExpired(at) {
|
|
10613
|
+
for (const [key, { until }] of remembered) {
|
|
10614
|
+
if (until > at) return;
|
|
10615
|
+
forget(key);
|
|
10616
|
+
}
|
|
10617
|
+
}
|
|
10618
|
+
return {
|
|
10619
|
+
stopRunning(chatId, turnRequestId) {
|
|
10620
|
+
const running = watched.get(keyOf(chatId, turnRequestId));
|
|
10621
|
+
running?.();
|
|
10622
|
+
return running !== void 0;
|
|
10623
|
+
},
|
|
10624
|
+
async remember(ownerId, chatId, turnRequestId) {
|
|
10625
|
+
const stoppedAt = now();
|
|
10626
|
+
const expiresAt = stoppedAt.getTime() + STOP_REQUEST_KEEP_MS;
|
|
10627
|
+
const key = keyOf(chatId, turnRequestId);
|
|
10628
|
+
forgetExpired(stoppedAt.getTime());
|
|
10629
|
+
forget(key);
|
|
10630
|
+
const keys = byOwner.get(ownerId) ?? [];
|
|
10631
|
+
while (keys.length >= STOP_REQUESTS_PER_OWNER) forget(keys[0]);
|
|
10632
|
+
remembered.set(key, { ownerId, until: expiresAt });
|
|
10633
|
+
keys.push(key);
|
|
10634
|
+
byOwner.set(ownerId, keys);
|
|
10635
|
+
if (!storage.saveStopRequest) return;
|
|
10636
|
+
await storage.saveStopRequest(
|
|
10637
|
+
{ ownerId, chatId, turnRequestId, stoppedAt: stoppedAt.toISOString(), expiresAt: new Date(expiresAt).toISOString() },
|
|
10638
|
+
{ keepPerOwner: STOP_REQUESTS_PER_OWNER }
|
|
10639
|
+
).catch((error) => logError(`\xAB\u0421\u0442\u043E\u043F\xBB \u0445\u043E\u0434\u0430 \u0447\u0430\u0442\u0430 ${chatId} \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D \u0432 \u0445\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435: ${error instanceof Error ? error.message : String(error)}`, error));
|
|
10640
|
+
},
|
|
10641
|
+
watch(chatId, turnRequestId, abort) {
|
|
10642
|
+
const key = keyOf(chatId, turnRequestId);
|
|
10643
|
+
let ended = false;
|
|
10644
|
+
let timer;
|
|
10645
|
+
let failed = false;
|
|
10646
|
+
const end = () => {
|
|
10647
|
+
if (ended) return;
|
|
10648
|
+
ended = true;
|
|
10649
|
+
clearInterval(timer);
|
|
10650
|
+
if (watched.get(key) === fire) watched.delete(key);
|
|
10651
|
+
};
|
|
10652
|
+
const fire = () => {
|
|
10653
|
+
if (ended) return;
|
|
10654
|
+
end();
|
|
10655
|
+
forget(key);
|
|
10656
|
+
abort();
|
|
10657
|
+
};
|
|
10658
|
+
if (remembered.has(key)) {
|
|
10659
|
+
fire();
|
|
10660
|
+
return end;
|
|
10661
|
+
}
|
|
10662
|
+
watched.set(key, fire);
|
|
10663
|
+
const hasStopRequest = storage.hasStopRequest?.bind(storage);
|
|
10664
|
+
if (!hasStopRequest) return end;
|
|
10665
|
+
let checking = false;
|
|
10666
|
+
const check = () => {
|
|
10667
|
+
if (ended || checking) return;
|
|
10668
|
+
checking = true;
|
|
10669
|
+
void hasStopRequest(chatId, turnRequestId).then(
|
|
10670
|
+
(stopped) => {
|
|
10671
|
+
if (stopped) fire();
|
|
10672
|
+
},
|
|
10673
|
+
(error) => {
|
|
10674
|
+
if (failed) return;
|
|
10675
|
+
failed = true;
|
|
10676
|
+
logError(`\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \xAB\u0421\u0442\u043E\u043F\xBB \u0445\u043E\u0434\u0430 \u0447\u0430\u0442\u0430 ${chatId}: ${error instanceof Error ? error.message : String(error)}`, error);
|
|
10677
|
+
}
|
|
10678
|
+
).finally(() => {
|
|
10679
|
+
checking = false;
|
|
10680
|
+
});
|
|
10681
|
+
};
|
|
10682
|
+
check();
|
|
10683
|
+
timer = setInterval(check, STOP_REQUESTS_CHECK_EVERY_MS);
|
|
10684
|
+
timer.unref?.();
|
|
10685
|
+
return end;
|
|
10686
|
+
}
|
|
10687
|
+
};
|
|
10688
|
+
}
|
|
10689
|
+
|
|
10576
10690
|
// src/transient-chat.ts
|
|
10577
10691
|
var checkpoints = /* @__PURE__ */ new WeakMap();
|
|
10578
10692
|
function registerTransientCheckpoint(service, checkpoint) {
|
|
@@ -13448,6 +13562,7 @@ function createChatService(input) {
|
|
|
13448
13562
|
const startingSlots = /* @__PURE__ */ new Map();
|
|
13449
13563
|
const admittingTurns = /* @__PURE__ */ new Map();
|
|
13450
13564
|
const stopsWhileStarting = /* @__PURE__ */ new Set();
|
|
13565
|
+
const stopRequests = createStopRequests({ storage, now, logError });
|
|
13451
13566
|
const deleting = /* @__PURE__ */ new Set();
|
|
13452
13567
|
const pendingClosures = /* @__PURE__ */ new Map();
|
|
13453
13568
|
const writingClosures = /* @__PURE__ */ new Set();
|
|
@@ -14330,6 +14445,8 @@ function createChatService(input) {
|
|
|
14330
14445
|
const { finished } = started;
|
|
14331
14446
|
steeringTurn = steering.begin(chatId, answerId);
|
|
14332
14447
|
if (stopsWhileStarting.delete(chatId)) registry.abort(chatId);
|
|
14448
|
+
const turnRequestId = launch.page?.turnRequestId;
|
|
14449
|
+
const endStopWatch = turnRequestId === void 0 ? void 0 : stopRequests.watch(chatId, turnRequestId, () => registry.runningMessageId(chatId) === answerId && registry.abort(chatId));
|
|
14333
14450
|
const turnEvent = { ownerId: chat.ownerId, chatId, messageId: answerId, trigger, channel };
|
|
14334
14451
|
chatEvents.emit({
|
|
14335
14452
|
type: "turn-started",
|
|
@@ -14345,6 +14462,7 @@ function createChatService(input) {
|
|
|
14345
14462
|
const slot = startingSlots.get(chatId);
|
|
14346
14463
|
startingSlots.delete(chatId);
|
|
14347
14464
|
void finished.then(() => {
|
|
14465
|
+
endStopWatch?.();
|
|
14348
14466
|
steeringTurn?.close();
|
|
14349
14467
|
liveTurn.end();
|
|
14350
14468
|
void toolQueue.whenIdle().then(() => {
|
|
@@ -15399,10 +15517,16 @@ function createChatService(input) {
|
|
|
15399
15517
|
const stream = registry.subscribe(chatId);
|
|
15400
15518
|
return stream && visibility.visibleChunks(stream);
|
|
15401
15519
|
},
|
|
15402
|
-
async stop(userId, chatId) {
|
|
15520
|
+
async stop(userId, chatId, stopOptions) {
|
|
15403
15521
|
await ownChat(userId, chatId);
|
|
15404
15522
|
const check = widgetChecks.get(chatId);
|
|
15405
15523
|
check?.abort();
|
|
15524
|
+
const turnRequestId = stopOptions?.turnRequestId;
|
|
15525
|
+
if (turnRequestId !== void 0) {
|
|
15526
|
+
if (stopRequests.stopRunning(chatId, turnRequestId)) return true;
|
|
15527
|
+
await stopRequests.remember(userId, chatId, turnRequestId);
|
|
15528
|
+
return true;
|
|
15529
|
+
}
|
|
15406
15530
|
if (registry.abort(chatId) || check !== void 0) return true;
|
|
15407
15531
|
if (handOffs.has(chatId)) return true;
|
|
15408
15532
|
if (await stoppingPendingBurst(userId, chatId)) return true;
|
|
@@ -15857,6 +15981,7 @@ export {
|
|
|
15857
15981
|
UnsupportedFormatVersionError,
|
|
15858
15982
|
assertKnownFormatVersion,
|
|
15859
15983
|
hasChatMessages,
|
|
15984
|
+
isTurnRequestId,
|
|
15860
15985
|
APP_CHANGE_PART_TYPE,
|
|
15861
15986
|
BROWSER_CALL_PART_TYPE,
|
|
15862
15987
|
BrowserCallNotPendingError,
|
|
@@ -15919,6 +16044,7 @@ export {
|
|
|
15919
16044
|
TooManyTurnsError,
|
|
15920
16045
|
ChatBusyError,
|
|
15921
16046
|
createRunningAnswerRegistry,
|
|
16047
|
+
STOP_REQUESTS_CHECK_EVERY_MS,
|
|
15922
16048
|
checkpointTransientChat,
|
|
15923
16049
|
getTransientChatHistory,
|
|
15924
16050
|
splitVoiceTags,
|
|
@@ -15958,4 +16084,4 @@ export {
|
|
|
15958
16084
|
InvalidWidgetAnswerError,
|
|
15959
16085
|
createChatService
|
|
15960
16086
|
};
|
|
15961
|
-
//# sourceMappingURL=chunk-
|
|
16087
|
+
//# sourceMappingURL=chunk-2MVJW2PT.js.map
|