@aiderdesk/aiderdesk 0.74.0 → 0.75.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/out/{open-telemetry-baOvr6sK.js → open-telemetry-B7yROZIC.js} +3 -0
- package/out/renderer/assets/{AgentSettings-B-793Wr6.js → AgentSettings-DX34HLFv.js} +2 -2
- package/out/renderer/assets/{InfoIcon-cuLXzJtV.js → InfoIcon-DzyZQ7Ye.js} +1 -1
- package/out/renderer/assets/{Onboarding-xrPWRnXm.js → Onboarding-FwXfKZ8B.js} +4 -4
- package/out/renderer/assets/{ProviderHeader-CMVyqpPa.js → ProviderHeader-Cii9aAmV.js} +275 -197
- package/out/renderer/assets/{SettingsPage-BBtDhv80.js → SettingsPage-XanGltUZ.js} +3 -3
- package/out/renderer/assets/{UsageDashboard-CGI4iwCD.js → UsageDashboard-eHbvZTZC.js} +3795 -2366
- package/out/renderer/assets/{arc-CFENq1wJ.js → arc-CVfdiTl1.js} +1 -1
- package/out/renderer/assets/{architectureDiagram-3BPJPVTR-BRG_9Mao.js → architectureDiagram-3BPJPVTR-DsLLo_Ek.js} +3 -3
- package/out/renderer/assets/{blockDiagram-GPEHLZMM-B3c7WMY4.js → blockDiagram-GPEHLZMM-eWy47S0_.js} +4 -4
- package/out/renderer/assets/{c4Diagram-AAUBKEIU-BYQrxMcW.js → c4Diagram-AAUBKEIU-BH9b_e6y.js} +2 -2
- package/out/renderer/assets/{channel-DPxL1rpa.js → channel-D1z_mPGJ.js} +1 -1
- package/out/renderer/assets/{chunk-2J33WTMH-C-kk05Nj.js → chunk-2J33WTMH-DK0Yw_7f.js} +1 -1
- package/out/renderer/assets/{chunk-4BX2VUAB-BV8PWxnG.js → chunk-4BX2VUAB-DIGR8Y5b.js} +1 -1
- package/out/renderer/assets/{chunk-55IACEB6-Cj6KHkUp.js → chunk-55IACEB6-DoCkLI5e.js} +1 -1
- package/out/renderer/assets/{chunk-727SXJPM-BaIkuSPr.js → chunk-727SXJPM-C2gQLzLi.js} +5 -5
- package/out/renderer/assets/{chunk-AQP2D5EJ-DVZR_bfB.js → chunk-AQP2D5EJ-D83_SlRR.js} +3 -3
- package/out/renderer/assets/{chunk-FMBD7UC4-CNrb2a0a.js → chunk-FMBD7UC4-CyiPoUsC.js} +1 -1
- package/out/renderer/assets/{chunk-ND2GUHAM-ClOnPDjy.js → chunk-ND2GUHAM-DfGsUYDD.js} +1 -1
- package/out/renderer/assets/{chunk-QZHKN3VN-B2sJx9j2.js → chunk-QZHKN3VN-BhnTFlht.js} +1 -1
- package/out/renderer/assets/{classDiagram-4FO5ZUOK-ZzwWMcLO.js → classDiagram-4FO5ZUOK-Dy7E8tVe.js} +6 -6
- package/out/renderer/assets/{classDiagram-v2-Q7XG4LA2-ZzwWMcLO.js → classDiagram-v2-Q7XG4LA2-Dy7E8tVe.js} +6 -6
- package/out/renderer/assets/{cose-bilkent-S5V4N54A-DBx-UiMU.js → cose-bilkent-S5V4N54A-Dsl61WN3.js} +1 -1
- package/out/renderer/assets/{dagre-BM42HDAG-B_vMvYpz.js → dagre-BM42HDAG-D-u18G94.js} +3 -3
- package/out/renderer/assets/{diagram-2AECGRRQ-Do-w2xXO.js → diagram-2AECGRRQ-BumP49Qp.js} +3 -3
- package/out/renderer/assets/{diagram-5GNKFQAL-JzG77sgb.js → diagram-5GNKFQAL-VpUN87Sw.js} +4 -4
- package/out/renderer/assets/{diagram-KO2AKTUF-CGMx2nPP.js → diagram-KO2AKTUF-CXCWwzRa.js} +3 -3
- package/out/renderer/assets/{diagram-LMA3HP47-BqXnQeNu.js → diagram-LMA3HP47-vlOcStwn.js} +3 -3
- package/out/renderer/assets/{diagram-OG6HWLK6-BR4e0lIb.js → diagram-OG6HWLK6-DS1BscxN.js} +4 -4
- package/out/renderer/assets/{erDiagram-TEJ5UH35-B7QK0XSy.js → erDiagram-TEJ5UH35-DPi6-CLL.js} +4 -4
- package/out/renderer/assets/{flowDiagram-I6XJVG4X-BOySqejA.js → flowDiagram-I6XJVG4X-BYlX12Cd.js} +6 -6
- package/out/renderer/assets/{ganttDiagram-6RSMTGT7-BORAleML.js → ganttDiagram-6RSMTGT7-BJQl-A9d.js} +3 -3
- package/out/renderer/assets/{gitGraphDiagram-PVQCEYII-DTReLiJT.js → gitGraphDiagram-PVQCEYII-CUFXx3IZ.js} +4 -4
- package/out/renderer/assets/{graph-Bf8U9r0n.js → graph-CbFubTTc.js} +1 -1
- package/out/renderer/assets/{index-BS5vy5uH.js → index-9GNr8q1O.js} +1 -1
- package/out/renderer/assets/{index-DUoUqcJ_.js → index-B6R_BNfE.js} +1 -1
- package/out/renderer/assets/{index-D3R9tjiT.js → index-B9iW9QmT.js} +1 -1
- package/out/renderer/assets/{index-D6b3rMtW.js → index-BkdacTnN.js} +1 -1
- package/out/renderer/assets/{index-CmQY2QKE.js → index-C7885gEz.js} +1 -1
- package/out/renderer/assets/{index-BOQBc3Qj.js → index-Cg7tn967.js} +575 -251
- package/out/renderer/assets/{index-7NwOg_q_.css → index-DCILJy4w.css} +42 -0
- package/out/renderer/assets/{index-Dq3ldCAy.js → index-DNlMJMPg.js} +3239 -2487
- package/out/renderer/assets/{index-COyr1I0o.js → index-DYKLRIHT.js} +1 -1
- package/out/renderer/assets/{index-5i67azF0.js → index-DeoI6jti.js} +1 -1
- package/out/renderer/assets/{index-Dtxgil7l.js → index-fD843lMX.js} +1 -1
- package/out/renderer/assets/{infoDiagram-5YYISTIA-Ryv-Emth.js → infoDiagram-5YYISTIA-IWJLFUYz.js} +2 -2
- package/out/renderer/assets/{ishikawaDiagram-YF4QCWOH-Blzp6JLN.js → ishikawaDiagram-YF4QCWOH-BuNfm7cB.js} +1 -1
- package/out/renderer/assets/{journeyDiagram-JHISSGLW--KB4ASET.js → journeyDiagram-JHISSGLW-CfceKUHO.js} +4 -4
- package/out/renderer/assets/{jsx-dev-runtime-DAzw_Red.js → jsx-dev-runtime-DT3FTts0.js} +1 -1
- package/out/renderer/assets/{kanban-definition-UN3LZRKU-BzNpCu_x.js → kanban-definition-UN3LZRKU-Bb6YnEgS.js} +2 -2
- package/out/renderer/assets/{layout-BQu4M-KW.js → layout-BkrDn6V9.js} +2 -2
- package/out/renderer/assets/{linear-DNZEF2Al.js → linear-jxO_dc8P.js} +1 -1
- package/out/renderer/assets/{mindmap-definition-RKZ34NQL-CxQjZIps.js → mindmap-definition-RKZ34NQL-BPRx7p9A.js} +3 -3
- package/out/renderer/assets/{pieDiagram-4H26LBE5-qJt7eGwM.js → pieDiagram-4H26LBE5-CPR4AuPM.js} +4 -4
- package/out/renderer/assets/{quadrantDiagram-W4KKPZXB-mMOhLjN_.js → quadrantDiagram-W4KKPZXB-BKzlAr7m.js} +2 -2
- package/out/renderer/assets/{requirementDiagram-4Y6WPE33-GLhMtLW7.js → requirementDiagram-4Y6WPE33-CUan3EZI.js} +3 -3
- package/out/renderer/assets/{sankeyDiagram-5OEKKPKP-Kcd8qR8y.js → sankeyDiagram-5OEKKPKP-y8X8qnX2.js} +1 -1
- package/out/renderer/assets/{sequenceDiagram-3UESZ5HK-CpmBIgMJ.js → sequenceDiagram-3UESZ5HK-B4xv8iDW.js} +3 -3
- package/out/renderer/assets/{stateDiagram-AJRCARHV-D00qZ9cQ.js → stateDiagram-AJRCARHV-DTPE2Z4L.js} +6 -6
- package/out/renderer/assets/{stateDiagram-v2-BHNVJYJU-CkEgNJrB.js → stateDiagram-v2-BHNVJYJU-BmZ9o6q3.js} +4 -4
- package/out/renderer/assets/{time-CQSoUo1N.js → time-D391Z6zp.js} +1 -1
- package/out/renderer/assets/{timeline-definition-PNZ67QCA-CmydTbH6.js → timeline-definition-PNZ67QCA-DVLUB2HD.js} +2 -2
- package/out/renderer/assets/{vennDiagram-CIIHVFJN-B4QGhnvI.js → vennDiagram-CIIHVFJN-BGGBlVN1.js} +1 -1
- package/out/renderer/assets/{wardley-L42UT6IY-B-mpW52K.js → wardley-L42UT6IY-ZVVSjQUD.js} +1 -1
- package/out/renderer/assets/{wardleyDiagram-YWT4CUSO-Cz1pK1MY.js → wardleyDiagram-YWT4CUSO-CRAH-LRw.js} +3 -3
- package/out/renderer/assets/{xychartDiagram-2RQKCTM6-H-Q9Zv48.js → xychartDiagram-2RQKCTM6-DQqvm7M3.js} +2 -2
- package/out/renderer/index.html +2 -2
- package/out/resources/linux/probe +0 -0
- package/out/resources/linux-x64/probe +0 -0
- package/out/resources/skills/extension-creator/SKILL.md +71 -7
- package/out/resources/skills/extension-creator/references/event-types.md +543 -40
- package/out/resources/skills/extension-creator/references/examples-gallery.md +23 -14
- package/out/resources/skills/extension-creator/references/extension-interface.md +1111 -171
- package/out/resources/skills/extension-creator/references/ui-components.md +34 -6
- package/out/runner.js +428 -320
- package/package.json +21 -19
- package/patches/@requesty+ai-sdk+3.5.0.patch +84 -0
- package/patches/ai+7.0.28.patch +33 -0
- package/patches/ai+5.0.195.patch +0 -33
package/out/runner.js
CHANGED
|
@@ -475,13 +475,19 @@ const extractImagesFromContent = (content) => {
|
|
|
475
475
|
if (!Array.isArray(content)) {
|
|
476
476
|
return void 0;
|
|
477
477
|
}
|
|
478
|
-
const images = content.
|
|
479
|
-
const
|
|
480
|
-
if (typeof
|
|
481
|
-
|
|
478
|
+
const images = content.map((part) => {
|
|
479
|
+
const p = part;
|
|
480
|
+
if (p.type === "image" && typeof p.image === "string") {
|
|
481
|
+
const data = p.image;
|
|
482
|
+
const mediaType = p.mediaType || "image/png";
|
|
483
|
+
return data.startsWith("data:") ? data : `data:${mediaType};base64,${data}`;
|
|
484
|
+
}
|
|
485
|
+
if (p.type === "file" && typeof p.data === "string" && (p.mediaType || "").startsWith("image/")) {
|
|
486
|
+
const data = p.data;
|
|
487
|
+
const mediaType = p.mediaType || "image/png";
|
|
488
|
+
return data.startsWith("data:") ? data : `data:${mediaType};base64,${data}`;
|
|
482
489
|
}
|
|
483
|
-
|
|
484
|
-
return data.startsWith("data:") ? data : `data:${mediaType};base64,${data}`;
|
|
490
|
+
return void 0;
|
|
485
491
|
}).filter((v) => v !== void 0);
|
|
486
492
|
return images.length > 0 ? images : void 0;
|
|
487
493
|
};
|
|
@@ -1748,8 +1754,20 @@ const COMPACT_CONVERSATION_AGENT_PROFILE = {
|
|
|
1748
1754
|
[`${SUBAGENTS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SUBAGENTS_TOOL_RUN_TASK}`]: ToolApprovalState.Never
|
|
1749
1755
|
}
|
|
1750
1756
|
};
|
|
1751
|
-
|
|
1757
|
+
const HANDOFF_AGENT_PROFILE = {
|
|
1752
1758
|
...DEFAULT_AGENT_PROFILE,
|
|
1759
|
+
id: "handoff",
|
|
1760
|
+
maxIterations: 5,
|
|
1761
|
+
includeRepoMap: false,
|
|
1762
|
+
includeContextFiles: false,
|
|
1763
|
+
usePowerTools: false,
|
|
1764
|
+
useAiderTools: false,
|
|
1765
|
+
useTodoTools: false,
|
|
1766
|
+
useSubagents: false,
|
|
1767
|
+
useTaskTools: false,
|
|
1768
|
+
useMemoryTools: false,
|
|
1769
|
+
useSkillsTools: false,
|
|
1770
|
+
isSubagent: true,
|
|
1753
1771
|
toolApprovals: {
|
|
1754
1772
|
...DEFAULT_AGENT_PROFILE.toolApprovals,
|
|
1755
1773
|
[`${POWER_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${POWER_TOOL_FILE_EDIT}`]: ToolApprovalState.Never,
|
|
@@ -1757,12 +1775,13 @@ const COMPACT_CONVERSATION_AGENT_PROFILE = {
|
|
|
1757
1775
|
[`${POWER_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${POWER_TOOL_BASH}`]: ToolApprovalState.Never,
|
|
1758
1776
|
[`${SUBAGENTS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SUBAGENTS_TOOL_RUN_TASK}`]: ToolApprovalState.Never
|
|
1759
1777
|
}
|
|
1760
|
-
}
|
|
1778
|
+
};
|
|
1761
1779
|
const getDefaultProviderParams = (providerName) => {
|
|
1762
1780
|
let provider;
|
|
1763
1781
|
const baseConfig = {
|
|
1764
1782
|
name: providerName,
|
|
1765
|
-
disableStreaming: false
|
|
1783
|
+
disableStreaming: false,
|
|
1784
|
+
disableToolCallStreaming: false
|
|
1766
1785
|
};
|
|
1767
1786
|
switch (providerName) {
|
|
1768
1787
|
case "openai":
|
|
@@ -2015,7 +2034,7 @@ class TelemetryManager {
|
|
|
2015
2034
|
}
|
|
2016
2035
|
async init() {
|
|
2017
2036
|
try {
|
|
2018
|
-
await Promise.resolve().then(() => require("./open-telemetry-
|
|
2037
|
+
await Promise.resolve().then(() => require("./open-telemetry-B7yROZIC.js"));
|
|
2019
2038
|
if (!POSTHOG_PUBLIC_API_KEY) ;
|
|
2020
2039
|
const app = getElectronApp();
|
|
2021
2040
|
this.client = new posthogNode.PostHog(POSTHOG_PUBLIC_API_KEY, {
|
|
@@ -2196,7 +2215,7 @@ const initializePostHogExporter = () => {
|
|
|
2196
2215
|
if (posthogApiKey) {
|
|
2197
2216
|
logger.info("Initializing PostHog Trace Exporter...");
|
|
2198
2217
|
return new otel.PostHogTraceExporter({
|
|
2199
|
-
|
|
2218
|
+
projectToken: posthogApiKey.value,
|
|
2200
2219
|
host: posthogHost?.value || "https://us.i.posthog.com"
|
|
2201
2220
|
});
|
|
2202
2221
|
}
|
|
@@ -3406,6 +3425,38 @@ const isNetworkError = (error) => {
|
|
|
3406
3425
|
}
|
|
3407
3426
|
return false;
|
|
3408
3427
|
};
|
|
3428
|
+
const convertMcpResultToModelOutput = (output) => {
|
|
3429
|
+
if (output && typeof output === "object" && "content" in output && Array.isArray(output.content)) {
|
|
3430
|
+
const content = output.content;
|
|
3431
|
+
const hasNonTextParts = content.some((part) => part && typeof part === "object" && part.type !== "text");
|
|
3432
|
+
if (hasNonTextParts) {
|
|
3433
|
+
const value = [];
|
|
3434
|
+
for (const part of content) {
|
|
3435
|
+
if (!part || typeof part !== "object") {
|
|
3436
|
+
continue;
|
|
3437
|
+
}
|
|
3438
|
+
if (part.type === "text" && typeof part.text === "string") {
|
|
3439
|
+
value.push({ type: "text", text: part.text });
|
|
3440
|
+
} else if ((part.type === "image" || part.type === "image-data" || part.type === "media") && typeof (part.data ?? part.image) === "string") {
|
|
3441
|
+
const data = part.data ?? part.image;
|
|
3442
|
+
const mediaType = typeof (part.mimeType ?? part.mediaType) === "string" ? part.mimeType ?? part.mediaType : "image/png";
|
|
3443
|
+
value.push({ type: "file", data: { type: "data", data }, mediaType });
|
|
3444
|
+
}
|
|
3445
|
+
}
|
|
3446
|
+
if (value.length > 0) {
|
|
3447
|
+
return { type: "content", value };
|
|
3448
|
+
}
|
|
3449
|
+
}
|
|
3450
|
+
const textParts = content.filter((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string").map((part) => part.text);
|
|
3451
|
+
if (textParts.length > 0) {
|
|
3452
|
+
return { type: "text", value: textParts.join("") };
|
|
3453
|
+
}
|
|
3454
|
+
}
|
|
3455
|
+
if (typeof output === "string") {
|
|
3456
|
+
return { type: "text", value: output };
|
|
3457
|
+
}
|
|
3458
|
+
return { type: "json", value: output ?? null };
|
|
3459
|
+
};
|
|
3409
3460
|
const IMAGE_TOKEN_ESTIMATE = 1e3;
|
|
3410
3461
|
const extractToolResultText = (output) => {
|
|
3411
3462
|
if (!output || typeof output !== "object") {
|
|
@@ -3444,7 +3495,7 @@ const estimateMessageTokens = (messages) => {
|
|
|
3444
3495
|
textParts.push(extractToolResultText(part.output));
|
|
3445
3496
|
} else if (type === "reasoning" && typeof part.text === "string") {
|
|
3446
3497
|
textParts.push(part.text);
|
|
3447
|
-
} else if (type === "image") {
|
|
3498
|
+
} else if (type === "image" || type === "file" && typeof part.mediaType === "string" && part.mediaType.startsWith("image/")) {
|
|
3448
3499
|
estimatedImageTokens += IMAGE_TOKEN_ESTIMATE;
|
|
3449
3500
|
}
|
|
3450
3501
|
}
|
|
@@ -5852,7 +5903,6 @@ const extractReasoningMiddleware = function extractReasoningMiddleware2({
|
|
|
5852
5903
|
const openingTag = `<${tagName}>`;
|
|
5853
5904
|
const closingTag = `</${tagName}>`;
|
|
5854
5905
|
return {
|
|
5855
|
-
middlewareVersion: "v2",
|
|
5856
5906
|
wrapStream: async ({ doStream }) => {
|
|
5857
5907
|
const { stream, ...rest } = await doStream();
|
|
5858
5908
|
let isFirstReasoning = true;
|
|
@@ -6918,7 +6968,7 @@ const optimizeAiderMessages = (messages) => {
|
|
|
6918
6968
|
const newMessages = lodash.cloneDeep(messages);
|
|
6919
6969
|
for (const message of newMessages) {
|
|
6920
6970
|
if (message.role === "tool") {
|
|
6921
|
-
const toolContent = message.content;
|
|
6971
|
+
const toolContent = message.content.filter((p) => p.type === "tool-result");
|
|
6922
6972
|
for (const toolResultPart of toolContent) {
|
|
6923
6973
|
if (toolResultPart.toolName === `${AIDER_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${AIDER_TOOL_RUN_PROMPT}` && toolResultPart.output.type === "json") {
|
|
6924
6974
|
try {
|
|
@@ -6937,7 +6987,7 @@ const optimizeSubagentMessages = (messages) => {
|
|
|
6937
6987
|
const newMessages = lodash.cloneDeep(messages);
|
|
6938
6988
|
for (const message of newMessages) {
|
|
6939
6989
|
if (message.role === "tool") {
|
|
6940
|
-
const toolContent = message.content;
|
|
6990
|
+
const toolContent = message.content.filter((p) => p.type === "tool-result");
|
|
6941
6991
|
for (const toolResultPart of toolContent) {
|
|
6942
6992
|
if (toolResultPart.toolName === `${SUBAGENTS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SUBAGENTS_TOOL_RUN_TASK}` && toolResultPart.output.type === "json") {
|
|
6943
6993
|
try {
|
|
@@ -6959,31 +7009,44 @@ const convertImageToolResults = (messages) => {
|
|
|
6959
7009
|
const newMessages = [];
|
|
6960
7010
|
for (const message of messages) {
|
|
6961
7011
|
if (message.role === "tool") {
|
|
6962
|
-
const toolContent = message.content;
|
|
7012
|
+
const toolContent = message.content.filter((p) => p.type === "tool-result");
|
|
6963
7013
|
const updatedToolContent = [];
|
|
6964
|
-
const
|
|
7014
|
+
const imageParts = [];
|
|
6965
7015
|
for (const toolResultPart of toolContent) {
|
|
6966
7016
|
try {
|
|
6967
|
-
|
|
6968
|
-
|
|
6969
|
-
|
|
6970
|
-
|
|
6971
|
-
|
|
6972
|
-
|
|
6973
|
-
|
|
6974
|
-
|
|
6975
|
-
|
|
6976
|
-
|
|
6977
|
-
|
|
6978
|
-
|
|
6979
|
-
|
|
6980
|
-
|
|
6981
|
-
|
|
6982
|
-
|
|
6983
|
-
|
|
7017
|
+
if (toolResultPart.output.type !== "text" && toolResultPart.output.type !== "json") {
|
|
7018
|
+
updatedToolContent.push(toolResultPart);
|
|
7019
|
+
continue;
|
|
7020
|
+
}
|
|
7021
|
+
let parsedResult = null;
|
|
7022
|
+
if (toolResultPart.output.type === "text") {
|
|
7023
|
+
parsedResult = JSON.parse(toolResultPart.output.value);
|
|
7024
|
+
} else if (toolResultPart.output.type === "json") {
|
|
7025
|
+
parsedResult = toolResultPart.output.value;
|
|
7026
|
+
}
|
|
7027
|
+
if (parsedResult && Array.isArray(parsedResult.content)) {
|
|
7028
|
+
const converted = convertMcpResultToModelOutput(parsedResult);
|
|
7029
|
+
if (converted.type === "content" && converted.value.some((p) => p.type === "file")) {
|
|
7030
|
+
const fileParts = converted.value.filter((p) => p.type === "file");
|
|
7031
|
+
const textParts = converted.value.filter((p) => p.type === "text");
|
|
7032
|
+
logger.debug(`[convertImageToolResults] Extracting ${fileParts.length} image(s) from tool result "${toolResultPart.toolName}" into user message`);
|
|
7033
|
+
for (const filePart of fileParts) {
|
|
7034
|
+
if (filePart.data.type === "data") {
|
|
7035
|
+
imageParts.push({
|
|
7036
|
+
type: "file",
|
|
7037
|
+
data: filePart.data,
|
|
7038
|
+
mediaType: filePart.mediaType
|
|
7039
|
+
});
|
|
6984
7040
|
}
|
|
6985
|
-
|
|
6986
|
-
|
|
7041
|
+
}
|
|
7042
|
+
const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
|
|
7043
|
+
updatedToolContent.push({
|
|
7044
|
+
...toolResultPart,
|
|
7045
|
+
output: { type: "text", value: textValue }
|
|
7046
|
+
});
|
|
7047
|
+
} else {
|
|
7048
|
+
updatedToolContent.push(toolResultPart);
|
|
7049
|
+
}
|
|
6987
7050
|
} else {
|
|
6988
7051
|
updatedToolContent.push(toolResultPart);
|
|
6989
7052
|
}
|
|
@@ -6995,11 +7058,12 @@ const convertImageToolResults = (messages) => {
|
|
|
6995
7058
|
...message,
|
|
6996
7059
|
content: updatedToolContent
|
|
6997
7060
|
});
|
|
6998
|
-
|
|
6999
|
-
logger.
|
|
7000
|
-
|
|
7061
|
+
if (imageParts.length > 0) {
|
|
7062
|
+
logger.debug(`[convertImageToolResults] Added user message with ${imageParts.length} image(s)`);
|
|
7063
|
+
newMessages.push({
|
|
7064
|
+
role: "user",
|
|
7065
|
+
content: imageParts
|
|
7001
7066
|
});
|
|
7002
|
-
newMessages.push(userMessage);
|
|
7003
7067
|
}
|
|
7004
7068
|
} else {
|
|
7005
7069
|
newMessages.push(message);
|
|
@@ -7332,7 +7396,8 @@ const createSubagentsToolset = async (_settings, task, agentProfileManager, main
|
|
|
7332
7396
|
'A short informational message describing what the subagent is doing, in continuous present tense (e.g., "Fixing the login bug"). This will be shown to the user while the subagent is working.'
|
|
7333
7397
|
)
|
|
7334
7398
|
}),
|
|
7335
|
-
execute: async (
|
|
7399
|
+
execute: async (input, { toolCallId }) => {
|
|
7400
|
+
const { prompt, subagentId, description } = input;
|
|
7336
7401
|
const targetSubagent = findEnabledSubagent(enabledSubagents, subagentId);
|
|
7337
7402
|
if (!targetSubagent) {
|
|
7338
7403
|
return `Error: Subagent with ID '${subagentId}' not found or not enabled.`;
|
|
@@ -7478,9 +7543,9 @@ class Agent {
|
|
|
7478
7543
|
text: `Here is image ${path.basename(file.path)} for your reference.`
|
|
7479
7544
|
});
|
|
7480
7545
|
imageParts.push({
|
|
7481
|
-
type: "
|
|
7482
|
-
|
|
7483
|
-
mediaType:
|
|
7546
|
+
type: "file",
|
|
7547
|
+
data: file.imageBase64,
|
|
7548
|
+
mediaType: "image"
|
|
7484
7549
|
});
|
|
7485
7550
|
} else if (!file.isImage && file.content) {
|
|
7486
7551
|
const filePath = path.isAbsolute(file.path) ? path.relative(task.getTaskDir(), file.path) : file.path;
|
|
@@ -7574,9 +7639,9 @@ ${file.content}</content-with-line-numbers>
|
|
|
7574
7639
|
text: `Here is image ${path.basename(file.path)} for your reference.`
|
|
7575
7640
|
});
|
|
7576
7641
|
imageParts.push({
|
|
7577
|
-
type: "
|
|
7578
|
-
|
|
7579
|
-
mediaType:
|
|
7642
|
+
type: "file",
|
|
7643
|
+
data: imageBase64,
|
|
7644
|
+
mediaType: "image"
|
|
7580
7645
|
});
|
|
7581
7646
|
continue;
|
|
7582
7647
|
}
|
|
@@ -7946,9 +8011,9 @@ ${fileList}${readOnlyNote}`
|
|
|
7946
8011
|
...images.map((dataUrl) => {
|
|
7947
8012
|
const match = dataUrl.match(/^data:(image\/[^;]+);base64,(.+)$/);
|
|
7948
8013
|
return {
|
|
7949
|
-
type: "
|
|
7950
|
-
|
|
7951
|
-
mediaType: match ? match[1] :
|
|
8014
|
+
type: "file",
|
|
8015
|
+
data: match ? match[2] : dataUrl,
|
|
8016
|
+
mediaType: match ? match[1] : "image/png"
|
|
7952
8017
|
};
|
|
7953
8018
|
})
|
|
7954
8019
|
] : prompt,
|
|
@@ -7963,7 +8028,7 @@ ${fileList}${readOnlyNote}`
|
|
|
7963
8028
|
parts: userRequestMessage.content.map((part) => ({
|
|
7964
8029
|
type: part.type,
|
|
7965
8030
|
...part.type === "text" ? { textPreview: part.text?.substring(0, 100) } : {},
|
|
7966
|
-
...part.type === "
|
|
8031
|
+
...part.type === "file" ? { mediaType: part.mediaType, dataPreview: typeof part.data === "string" ? part.data.substring(0, 80) : typeof part.data } : {}
|
|
7967
8032
|
}))
|
|
7968
8033
|
}
|
|
7969
8034
|
});
|
|
@@ -8081,7 +8146,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8081
8146
|
task.task.lastAgentProviderMetadata
|
|
8082
8147
|
);
|
|
8083
8148
|
logger.debug("LLM model created successfully", {
|
|
8084
|
-
model: model.modelId
|
|
8149
|
+
model: typeof model !== "string" ? model.modelId : model
|
|
8085
8150
|
});
|
|
8086
8151
|
const repairToolCall = async ({ toolCall, tools, error, messages: messages2, system }) => {
|
|
8087
8152
|
if (ai.NoSuchToolError.isInstance(error)) {
|
|
@@ -8168,7 +8233,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8168
8233
|
const effectiveTemperature = profile.temperature ?? modelSettings?.temperature;
|
|
8169
8234
|
const effectiveMaxOutputTokens = profile.maxTokens ?? modelSettings?.maxOutputTokens;
|
|
8170
8235
|
logger.debug("Parameters:", {
|
|
8171
|
-
model: model.modelId,
|
|
8236
|
+
model: typeof model !== "string" ? model.modelId : model,
|
|
8172
8237
|
temperature: effectiveTemperature,
|
|
8173
8238
|
maxOutputTokens: effectiveMaxOutputTokens,
|
|
8174
8239
|
minTimeBetweenToolCalls: profile.minTimeBetweenToolCalls,
|
|
@@ -8206,14 +8271,14 @@ ${fileList}${readOnlyNote}`
|
|
|
8206
8271
|
tagName: "think"
|
|
8207
8272
|
})
|
|
8208
8273
|
}),
|
|
8209
|
-
|
|
8274
|
+
instructions: systemPrompt,
|
|
8210
8275
|
messages: optimizedMessages,
|
|
8211
8276
|
tools: toolSet,
|
|
8212
8277
|
abortSignal: effectiveAbortSignal,
|
|
8213
8278
|
maxOutputTokens: effectiveMaxOutputTokens,
|
|
8214
8279
|
maxRetries: 5,
|
|
8215
8280
|
temperature: effectiveTemperature,
|
|
8216
|
-
|
|
8281
|
+
telemetry: this.getTelemetrySettings(),
|
|
8217
8282
|
...providerParameters
|
|
8218
8283
|
};
|
|
8219
8284
|
};
|
|
@@ -8236,7 +8301,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8236
8301
|
let finishReason = null;
|
|
8237
8302
|
let currentStepMessages = [];
|
|
8238
8303
|
let responseMessageIndex = 0;
|
|
8239
|
-
const
|
|
8304
|
+
const onStepEnd = async (stepResult) => {
|
|
8240
8305
|
finishReason = stepResult.finishReason;
|
|
8241
8306
|
if (finishReason === "error") {
|
|
8242
8307
|
logger.error("Error during prompt:", { stepResult });
|
|
@@ -8308,11 +8373,12 @@ ${fileList}${readOnlyNote}`
|
|
|
8308
8373
|
logger.debug("Streaming disabled, using generateText");
|
|
8309
8374
|
await ai.generateText({
|
|
8310
8375
|
...await getBaseModelCallParams(),
|
|
8311
|
-
|
|
8376
|
+
onStepEnd,
|
|
8312
8377
|
experimental_repairToolCall: repairToolCall
|
|
8313
8378
|
});
|
|
8314
8379
|
} else {
|
|
8315
8380
|
logger.debug("Streaming enabled, using streamText");
|
|
8381
|
+
const toolCallStreamingDisabled = this.modelManager.isToolCallStreamingDisabled(provider, modelName);
|
|
8316
8382
|
const result = ai.streamText({
|
|
8317
8383
|
...await getBaseModelCallParams(),
|
|
8318
8384
|
experimental_transform: ai.smoothStream({
|
|
@@ -8335,12 +8401,12 @@ ${fileList}${readOnlyNote}`
|
|
|
8335
8401
|
task.addLogMessage("error", JSON.stringify(error), false, promptContext);
|
|
8336
8402
|
}
|
|
8337
8403
|
},
|
|
8338
|
-
|
|
8404
|
+
onStepEnd,
|
|
8339
8405
|
experimental_repairToolCall: repairToolCall
|
|
8340
8406
|
});
|
|
8341
8407
|
try {
|
|
8342
|
-
for await (const chunk of result.
|
|
8343
|
-
logger.debug("Chunk:", { chunk
|
|
8408
|
+
for await (const chunk of result.stream) {
|
|
8409
|
+
logger.debug("Chunk:", { chunk, responseMessageIndex });
|
|
8344
8410
|
const responseMessageId = responseMessageIndex > 0 ? `${currentResponseId}-${responseMessageIndex}` : currentResponseId;
|
|
8345
8411
|
if (chunk.type === "text-start") {
|
|
8346
8412
|
} else if (chunk.type === "text-end") {
|
|
@@ -8369,8 +8435,23 @@ ${fileList}${readOnlyNote}`
|
|
|
8369
8435
|
promptContext
|
|
8370
8436
|
});
|
|
8371
8437
|
} else if (chunk.type === "tool-input-start") {
|
|
8438
|
+
if (toolCallStreamingDisabled) {
|
|
8439
|
+
continue;
|
|
8440
|
+
}
|
|
8441
|
+
const [serverName, toolName] = extractServerNameToolName(chunk.toolName);
|
|
8442
|
+
task.startToolInput(chunk.id, serverName, toolName, promptContext);
|
|
8372
8443
|
task.addLogMessage("loading", "Preparing tool...", false, promptContext);
|
|
8373
8444
|
streamingMessageIds.add(chunk.id);
|
|
8445
|
+
} else if (chunk.type === "tool-input-delta") {
|
|
8446
|
+
if (toolCallStreamingDisabled) {
|
|
8447
|
+
continue;
|
|
8448
|
+
}
|
|
8449
|
+
task.processToolInputDelta(chunk.id, chunk.delta);
|
|
8450
|
+
} else if (chunk.type === "tool-input-end") {
|
|
8451
|
+
if (toolCallStreamingDisabled) {
|
|
8452
|
+
continue;
|
|
8453
|
+
}
|
|
8454
|
+
task.finishToolInput(chunk.id);
|
|
8374
8455
|
} else if (chunk.type === "tool-call") {
|
|
8375
8456
|
task.addLogMessage("loading", "Executing tool...", false, promptContext);
|
|
8376
8457
|
streamingMessageIds.add(chunk.toolCallId);
|
|
@@ -8407,9 +8488,13 @@ ${fileList}${readOnlyNote}`
|
|
|
8407
8488
|
this.removeUnfinishedStreamingMessages(task, streamingMessageIds);
|
|
8408
8489
|
retryCount++;
|
|
8409
8490
|
continue;
|
|
8410
|
-
} else if (iterationError instanceof ai.APICallError && iterationError.isRetryable && this.modelManager.isRetryable(resolvedProvider, modelName, iterationError)) {
|
|
8491
|
+
} else if (iterationError instanceof ai.APICallError && iterationError.isRetryable && retryCount < MAX_RETRIES && this.modelManager.isRetryable(resolvedProvider, modelName, iterationError)) {
|
|
8492
|
+
retryCount++;
|
|
8411
8493
|
continue;
|
|
8412
8494
|
} else {
|
|
8495
|
+
await task.updateTask({
|
|
8496
|
+
state: DefaultTaskState.Interrupted
|
|
8497
|
+
});
|
|
8413
8498
|
break;
|
|
8414
8499
|
}
|
|
8415
8500
|
}
|
|
@@ -8435,7 +8520,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8435
8520
|
}
|
|
8436
8521
|
break;
|
|
8437
8522
|
}
|
|
8438
|
-
if ((finishReason === "
|
|
8523
|
+
if ((finishReason === "other" || !finishReason) && retryCount < MAX_RETRIES) {
|
|
8439
8524
|
logger.debug(`Finish reason is "${finishReason}". Retrying...`);
|
|
8440
8525
|
retryCount++;
|
|
8441
8526
|
continue;
|
|
@@ -8520,7 +8605,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8520
8605
|
const helpersPrefix = `${HELPERS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}`;
|
|
8521
8606
|
return resultMessages.reduce((acc, message) => {
|
|
8522
8607
|
if (message.role === "tool") {
|
|
8523
|
-
const nonHelpersContent = message.content.filter((part) => !part.toolName.startsWith(helpersPrefix));
|
|
8608
|
+
const nonHelpersContent = message.content.filter((part) => part.type === "tool-result" && !part.toolName.startsWith(helpersPrefix));
|
|
8524
8609
|
if (nonHelpersContent.length === 0) {
|
|
8525
8610
|
return acc;
|
|
8526
8611
|
}
|
|
@@ -8744,12 +8829,12 @@ ${fileList}${readOnlyNote}`
|
|
|
8744
8829
|
try {
|
|
8745
8830
|
const result = await ai.generateText({
|
|
8746
8831
|
model,
|
|
8747
|
-
|
|
8832
|
+
instructions: systemPrompt,
|
|
8748
8833
|
messages: await optimizeMessages(messages, cacheControl),
|
|
8749
8834
|
abortSignal: effectiveAbortSignal,
|
|
8750
8835
|
providerOptions,
|
|
8751
8836
|
...providerParameters,
|
|
8752
|
-
|
|
8837
|
+
telemetry: this.getTelemetrySettings()
|
|
8753
8838
|
});
|
|
8754
8839
|
return result.text;
|
|
8755
8840
|
} catch (error) {
|
|
@@ -8797,17 +8882,17 @@ ${fileList}${readOnlyNote}`
|
|
|
8797
8882
|
content: prompt
|
|
8798
8883
|
});
|
|
8799
8884
|
try {
|
|
8800
|
-
const result = await ai.
|
|
8885
|
+
const result = await ai.generateText({
|
|
8801
8886
|
model,
|
|
8802
|
-
schema,
|
|
8803
|
-
|
|
8887
|
+
output: ai.Output.object({ schema }),
|
|
8888
|
+
instructions: systemPrompt,
|
|
8804
8889
|
messages: await optimizeMessages(messages, cacheControl),
|
|
8805
8890
|
abortSignal: effectiveAbortSignal,
|
|
8806
8891
|
providerOptions,
|
|
8807
8892
|
...providerParameters,
|
|
8808
|
-
|
|
8893
|
+
telemetry: this.getTelemetrySettings()
|
|
8809
8894
|
});
|
|
8810
|
-
return result.
|
|
8895
|
+
return result.output;
|
|
8811
8896
|
} catch (error) {
|
|
8812
8897
|
if (effectiveAbortSignal?.aborted) {
|
|
8813
8898
|
logger.info("Generating object aborted by user");
|
|
@@ -8886,8 +8971,8 @@ ${fileList}${readOnlyNote}`
|
|
|
8886
8971
|
messageIds.clear();
|
|
8887
8972
|
}
|
|
8888
8973
|
}
|
|
8889
|
-
async processStep(currentResponseId, { content, reasoningText, text, toolCalls, toolResults, finishReason, usage, providerMetadata, response }, task, provider, model, promptContext, abortSignal) {
|
|
8890
|
-
logger.info(`Step finished. Reason: ${finishReason}`, {
|
|
8974
|
+
async processStep(currentResponseId, { content, reasoningText, text, toolCalls, toolResults, finishReason, rawFinishReason, usage, providerMetadata, response }, task, provider, model, promptContext, abortSignal) {
|
|
8975
|
+
logger.info(`Step finished. Reason: ${finishReason} (${rawFinishReason})`, {
|
|
8891
8976
|
currentResponseId,
|
|
8892
8977
|
reasoningText: reasoningText?.substring(0, 100),
|
|
8893
8978
|
// Log truncated reasoning
|
|
@@ -8897,7 +8982,8 @@ ${fileList}${readOnlyNote}`
|
|
|
8897
8982
|
toolResults: toolResults?.map((tr) => tr.toolName),
|
|
8898
8983
|
usage,
|
|
8899
8984
|
providerMetadata,
|
|
8900
|
-
promptContext
|
|
8985
|
+
promptContext,
|
|
8986
|
+
contentLength: content.length
|
|
8901
8987
|
});
|
|
8902
8988
|
const messages = [];
|
|
8903
8989
|
const usageReport = this.modelManager.getUsageReport(task, provider, model, usage, providerMetadata);
|
|
@@ -8923,6 +9009,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8923
9009
|
let part = content[i];
|
|
8924
9010
|
if (part.type === "reasoning") {
|
|
8925
9011
|
reasoningText = part.text;
|
|
9012
|
+
text = "";
|
|
8926
9013
|
part = content[++i];
|
|
8927
9014
|
}
|
|
8928
9015
|
if (part?.type === "text") {
|
|
@@ -9017,10 +9104,7 @@ ${fileList}${readOnlyNote}`
|
|
|
9017
9104
|
const totalTokens = usageReport.sentTokens + usageReport.receivedTokens + (usageReport.cacheReadTokens ?? 0);
|
|
9018
9105
|
let effectiveThreshold;
|
|
9019
9106
|
let thresholdDescription;
|
|
9020
|
-
if (taskTokensOverride !== void 0) {
|
|
9021
|
-
if (taskTokensOverride === 0) {
|
|
9022
|
-
return true;
|
|
9023
|
-
}
|
|
9107
|
+
if (taskTokensOverride !== void 0 && taskTokensOverride > 0) {
|
|
9024
9108
|
effectiveThreshold = taskTokensOverride;
|
|
9025
9109
|
thresholdDescription = `task override: ${taskTokensOverride}`;
|
|
9026
9110
|
} else {
|
|
@@ -9029,7 +9113,11 @@ ${fileList}${readOnlyNote}`
|
|
|
9029
9113
|
}
|
|
9030
9114
|
const percentageThreshold = maxTokens * thresholdConfig.percentage / 100;
|
|
9031
9115
|
const tokenThreshold = thresholdConfig.tokens;
|
|
9032
|
-
|
|
9116
|
+
if (tokenThreshold > 0) {
|
|
9117
|
+
effectiveThreshold = Math.min(percentageThreshold, tokenThreshold);
|
|
9118
|
+
} else {
|
|
9119
|
+
effectiveThreshold = percentageThreshold;
|
|
9120
|
+
}
|
|
9033
9121
|
thresholdDescription = `percentage: ${percentageThreshold}, tokens: ${tokenThreshold}`;
|
|
9034
9122
|
}
|
|
9035
9123
|
logger.debug("Checking total tokens vs effective threshold", {
|
|
@@ -9093,7 +9181,7 @@ ${fileList}${readOnlyNote}`
|
|
|
9093
9181
|
const continuationText = `Based on your compacted summary of our previous conversation, please continue our work with my request:
|
|
9094
9182
|
|
|
9095
9183
|
${extractTextContent(userRequestMessage.content)}`;
|
|
9096
|
-
const originalImageParts = Array.isArray(userRequestMessage.content) ? userRequestMessage.content.filter((part) => part.type === "
|
|
9184
|
+
const originalImageParts = Array.isArray(userRequestMessage.content) ? userRequestMessage.content.filter((part) => part.type === "file") : [];
|
|
9097
9185
|
resultMessages.push({
|
|
9098
9186
|
id: uuid.v4(),
|
|
9099
9187
|
role: "user",
|
|
@@ -9895,6 +9983,10 @@ const GetUpdatedFilesSchema = zod.z.object({
|
|
|
9895
9983
|
projectDir: zod.z.string().min(1, "Project directory is required"),
|
|
9896
9984
|
taskId: zod.z.string().min(1, "Task ID is required")
|
|
9897
9985
|
});
|
|
9986
|
+
const RefreshContextFilesSchema = zod.z.object({
|
|
9987
|
+
projectDir: zod.z.string().min(1, "Project directory is required"),
|
|
9988
|
+
taskId: zod.z.string().min(1, "Task ID is required")
|
|
9989
|
+
});
|
|
9898
9990
|
class ContextApi extends BaseApi {
|
|
9899
9991
|
constructor(projectManager, eventsHandler) {
|
|
9900
9992
|
super();
|
|
@@ -9982,6 +10074,18 @@ class ContextApi extends BaseApi {
|
|
|
9982
10074
|
res.status(200).json(updatedFiles);
|
|
9983
10075
|
})
|
|
9984
10076
|
);
|
|
10077
|
+
router.post(
|
|
10078
|
+
"/refresh-context-files",
|
|
10079
|
+
this.handleRequest(async (req, res) => {
|
|
10080
|
+
const parsed = this.validateRequest(RefreshContextFilesSchema, req.body, res);
|
|
10081
|
+
if (!parsed) {
|
|
10082
|
+
return;
|
|
10083
|
+
}
|
|
10084
|
+
const { projectDir, taskId } = parsed;
|
|
10085
|
+
await this.eventsHandler.refreshContextFiles(projectDir, taskId);
|
|
10086
|
+
res.status(200).json({ message: "Context files refreshed" });
|
|
10087
|
+
})
|
|
10088
|
+
);
|
|
9985
10089
|
}
|
|
9986
10090
|
}
|
|
9987
10091
|
const RunPromptSchema = zod.z.object({
|
|
@@ -10025,6 +10129,7 @@ const SSE_ALLOWED_EVENT_TYPES = /* @__PURE__ */ new Set([
|
|
|
10025
10129
|
"response-chunk",
|
|
10026
10130
|
"response-completed",
|
|
10027
10131
|
"tool",
|
|
10132
|
+
"tool-input-chunk",
|
|
10028
10133
|
"user-message",
|
|
10029
10134
|
"log",
|
|
10030
10135
|
"ask-question",
|
|
@@ -14197,11 +14302,22 @@ ${JSON.stringify(part.output.value)}`
|
|
|
14197
14302
|
}
|
|
14198
14303
|
} else if (message.role === "user") {
|
|
14199
14304
|
const content = extractTextContent(message.content);
|
|
14200
|
-
const images = Array.isArray(message.content) ? message.content.
|
|
14201
|
-
const
|
|
14202
|
-
const
|
|
14203
|
-
|
|
14204
|
-
|
|
14305
|
+
const images = Array.isArray(message.content) ? message.content.map((part) => {
|
|
14306
|
+
const p = part;
|
|
14307
|
+
const isImage = p.type === "image";
|
|
14308
|
+
const isFileImage = p.type === "file" && (p.mediaType || "").startsWith("image/");
|
|
14309
|
+
if (isImage && typeof p.image === "string") {
|
|
14310
|
+
const data = p.image;
|
|
14311
|
+
const mediaType = p.mediaType || "image/png";
|
|
14312
|
+
return data.startsWith("data:") ? data : `data:${mediaType};base64,${data}`;
|
|
14313
|
+
}
|
|
14314
|
+
if (isFileImage && typeof p.data === "string") {
|
|
14315
|
+
const data = p.data;
|
|
14316
|
+
const mediaType = p.mediaType || "image/png";
|
|
14317
|
+
return data.startsWith("data:") ? data : `data:${mediaType};base64,${data}`;
|
|
14318
|
+
}
|
|
14319
|
+
return void 0;
|
|
14320
|
+
}).filter((v) => v !== void 0) : void 0;
|
|
14205
14321
|
const userMessageData = {
|
|
14206
14322
|
type: "user",
|
|
14207
14323
|
id: message.id || uuid.v4(),
|
|
@@ -17011,6 +17127,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
|
|
|
17011
17127
|
}
|
|
17012
17128
|
const INTERNAL_TASK_ID = "internal";
|
|
17013
17129
|
const RESPONSE_CHUNK_FLUSH_INTERVAL_MS = 10;
|
|
17130
|
+
const TOOL_INPUT_FLUSH_INTERVAL_MS = 50;
|
|
17014
17131
|
const EMPTY_TASK_DATA = {
|
|
17015
17132
|
id: "",
|
|
17016
17133
|
baseDir: "",
|
|
@@ -17104,6 +17221,7 @@ class Task {
|
|
|
17104
17221
|
agentRunResolves = [];
|
|
17105
17222
|
git = null;
|
|
17106
17223
|
responseChunkMap = /* @__PURE__ */ new Map();
|
|
17224
|
+
toolInputChunkMap = /* @__PURE__ */ new Map();
|
|
17107
17225
|
isDeterminingTaskState = false;
|
|
17108
17226
|
resolutionAbortControllers = {};
|
|
17109
17227
|
subagentAbortControllers = {};
|
|
@@ -17457,6 +17575,12 @@ class Task {
|
|
|
17457
17575
|
clearInterval(entry.interval);
|
|
17458
17576
|
}
|
|
17459
17577
|
this.responseChunkMap.clear();
|
|
17578
|
+
for (const entry of this.toolInputChunkMap.values()) {
|
|
17579
|
+
if (entry.interval) {
|
|
17580
|
+
clearInterval(entry.interval);
|
|
17581
|
+
}
|
|
17582
|
+
}
|
|
17583
|
+
this.toolInputChunkMap.clear();
|
|
17460
17584
|
}
|
|
17461
17585
|
async close(clearContext = false, cleanupEmptyTask = true) {
|
|
17462
17586
|
if (!this.initialized) {
|
|
@@ -17974,6 +18098,11 @@ ${contentText}</agent-response>`;
|
|
|
17974
18098
|
}
|
|
17975
18099
|
}
|
|
17976
18100
|
async processResponseMessage(message, saveToDb = true) {
|
|
18101
|
+
logger.debug("Processing response message", {
|
|
18102
|
+
baseDir: this.project.baseDir,
|
|
18103
|
+
taskId: this.taskId,
|
|
18104
|
+
messageData: message
|
|
18105
|
+
});
|
|
17977
18106
|
if (!message.finished) {
|
|
17978
18107
|
const sendResponseChunk = async (content, reasoning) => {
|
|
17979
18108
|
let data = {
|
|
@@ -18090,6 +18219,73 @@ ${contentText}</agent-response>`;
|
|
|
18090
18219
|
sendResponseCompleted(data) {
|
|
18091
18220
|
this.eventManager.sendResponseCompleted(data);
|
|
18092
18221
|
}
|
|
18222
|
+
startToolInput(toolCallId, serverName, toolName, promptContext) {
|
|
18223
|
+
this.toolInputChunkMap.set(toolCallId, {
|
|
18224
|
+
accumulatedDelta: "",
|
|
18225
|
+
serverName,
|
|
18226
|
+
toolName,
|
|
18227
|
+
promptContext,
|
|
18228
|
+
interval: null
|
|
18229
|
+
});
|
|
18230
|
+
this.sendToolInputChunk(toolCallId, {}, false);
|
|
18231
|
+
}
|
|
18232
|
+
processToolInputDelta(toolCallId, delta) {
|
|
18233
|
+
const entry = this.toolInputChunkMap.get(toolCallId);
|
|
18234
|
+
if (!entry) {
|
|
18235
|
+
return;
|
|
18236
|
+
}
|
|
18237
|
+
entry.accumulatedDelta += delta;
|
|
18238
|
+
if (!entry.interval) {
|
|
18239
|
+
entry.interval = setInterval(async () => {
|
|
18240
|
+
await this.flushToolInput(toolCallId, false);
|
|
18241
|
+
}, TOOL_INPUT_FLUSH_INTERVAL_MS);
|
|
18242
|
+
}
|
|
18243
|
+
}
|
|
18244
|
+
finishToolInput(toolCallId) {
|
|
18245
|
+
const entry = this.toolInputChunkMap.get(toolCallId);
|
|
18246
|
+
if (!entry) {
|
|
18247
|
+
return;
|
|
18248
|
+
}
|
|
18249
|
+
if (entry.interval) {
|
|
18250
|
+
clearInterval(entry.interval);
|
|
18251
|
+
entry.interval = null;
|
|
18252
|
+
}
|
|
18253
|
+
void this.flushToolInput(toolCallId, true);
|
|
18254
|
+
}
|
|
18255
|
+
async flushToolInput(toolCallId, isComplete) {
|
|
18256
|
+
const entry = this.toolInputChunkMap.get(toolCallId);
|
|
18257
|
+
if (!entry) {
|
|
18258
|
+
return;
|
|
18259
|
+
}
|
|
18260
|
+
let partialArgs = void 0;
|
|
18261
|
+
try {
|
|
18262
|
+
const result = await ai.parsePartialJson(entry.accumulatedDelta);
|
|
18263
|
+
if (result.state !== "failed-parse" && result.state !== "undefined-input") {
|
|
18264
|
+
partialArgs = result.value;
|
|
18265
|
+
}
|
|
18266
|
+
} catch {
|
|
18267
|
+
}
|
|
18268
|
+
if (partialArgs !== void 0 || isComplete) {
|
|
18269
|
+
this.sendToolInputChunk(toolCallId, partialArgs, isComplete);
|
|
18270
|
+
}
|
|
18271
|
+
}
|
|
18272
|
+
sendToolInputChunk(toolCallId, partialArgs, isComplete) {
|
|
18273
|
+
const entry = this.toolInputChunkMap.get(toolCallId);
|
|
18274
|
+
if (!entry) {
|
|
18275
|
+
return;
|
|
18276
|
+
}
|
|
18277
|
+
const data = {
|
|
18278
|
+
baseDir: this.project.baseDir,
|
|
18279
|
+
taskId: this.taskId,
|
|
18280
|
+
toolCallId,
|
|
18281
|
+
serverName: entry.serverName,
|
|
18282
|
+
toolName: entry.toolName,
|
|
18283
|
+
partialArgs,
|
|
18284
|
+
isComplete,
|
|
18285
|
+
promptContext: entry.promptContext
|
|
18286
|
+
};
|
|
18287
|
+
this.eventManager.sendToolInputChunk(data);
|
|
18288
|
+
}
|
|
18093
18289
|
notifyIfEnabled(title, text) {
|
|
18094
18290
|
const settings = this.store.getSettings();
|
|
18095
18291
|
if (!settings.notificationsEnabled) {
|
|
@@ -18248,6 +18444,9 @@ ${contentText}</agent-response>`;
|
|
|
18248
18444
|
const allFiles = await this.getContextFiles(!AIDER_MODES.includes(mode));
|
|
18249
18445
|
this.eventManager.sendContextFilesUpdated(this.project.baseDir, this.taskId, allFiles);
|
|
18250
18446
|
}
|
|
18447
|
+
async refreshContextFiles() {
|
|
18448
|
+
await this.sendContextFilesUpdated();
|
|
18449
|
+
}
|
|
18251
18450
|
async runCommand(command, addToHistory = true) {
|
|
18252
18451
|
const extensionResult = await this.extensionManager.dispatchEvent("onCommandExecuted", { command }, this.project, this);
|
|
18253
18452
|
if (extensionResult.blocked) {
|
|
@@ -19174,6 +19373,13 @@ ${contentText}</agent-response>`;
|
|
|
19174
19373
|
logger.debug("No tool id provided tool message, skipping...");
|
|
19175
19374
|
return;
|
|
19176
19375
|
}
|
|
19376
|
+
const toolInputEntry = this.toolInputChunkMap.get(id);
|
|
19377
|
+
if (toolInputEntry) {
|
|
19378
|
+
if (toolInputEntry.interval) {
|
|
19379
|
+
clearInterval(toolInputEntry.interval);
|
|
19380
|
+
}
|
|
19381
|
+
this.toolInputChunkMap.delete(id);
|
|
19382
|
+
}
|
|
19177
19383
|
logger.debug("Sending tool message:", {
|
|
19178
19384
|
id,
|
|
19179
19385
|
baseDir: this.project.baseDir,
|
|
@@ -19551,33 +19757,42 @@ ${contentText}</agent-response>`;
|
|
|
19551
19757
|
}
|
|
19552
19758
|
this.addLogMessage("loading", loadingMessage, false, void 0, ["interrupt"]);
|
|
19553
19759
|
const contextFiles = await this.getContextFiles();
|
|
19554
|
-
const handoffPrompt = await this.promptsManager.getHandoffPrompt(this, focus.trim().length ? focus.trim() : void 0);
|
|
19555
19760
|
let generatedPrompt;
|
|
19556
|
-
|
|
19557
|
-
const
|
|
19558
|
-
if (!
|
|
19559
|
-
|
|
19560
|
-
|
|
19561
|
-
|
|
19562
|
-
|
|
19563
|
-
|
|
19564
|
-
|
|
19565
|
-
|
|
19566
|
-
|
|
19567
|
-
|
|
19568
|
-
|
|
19569
|
-
|
|
19570
|
-
|
|
19571
|
-
|
|
19572
|
-
|
|
19573
|
-
|
|
19574
|
-
|
|
19575
|
-
|
|
19576
|
-
|
|
19577
|
-
|
|
19578
|
-
|
|
19579
|
-
|
|
19761
|
+
try {
|
|
19762
|
+
const handoffPrompt = await this.promptsManager.getHandoffPrompt(this, focus.trim().length ? focus.trim() : void 0);
|
|
19763
|
+
if (!AIDER_MODES.includes(mode)) {
|
|
19764
|
+
const profile = await this.getTaskAgentProfile();
|
|
19765
|
+
if (!profile) {
|
|
19766
|
+
throw new Error("No active Agent profile found");
|
|
19767
|
+
}
|
|
19768
|
+
const handoffAgentProfile = {
|
|
19769
|
+
...HANDOFF_AGENT_PROFILE,
|
|
19770
|
+
provider: profile.provider,
|
|
19771
|
+
model: profile.model
|
|
19772
|
+
};
|
|
19773
|
+
if (waitForAgentCompletion) {
|
|
19774
|
+
await this.waitForCurrentAgentToFinish();
|
|
19775
|
+
}
|
|
19776
|
+
generatedPrompt = await this.agent.generateText(
|
|
19777
|
+
`${handoffAgentProfile.provider}/${handoffAgentProfile.model}`,
|
|
19778
|
+
"",
|
|
19779
|
+
handoffPrompt,
|
|
19780
|
+
this.getProjectDir(),
|
|
19781
|
+
await this.contextManager.getContextMessages(),
|
|
19782
|
+
true
|
|
19783
|
+
);
|
|
19784
|
+
} else {
|
|
19785
|
+
const responses = await this.sendPromptToAider(handoffPrompt, void 0, "ask");
|
|
19786
|
+
if (responses.length > 0 && responses[0].content) {
|
|
19787
|
+
generatedPrompt = extractTextContent(responses[0].content);
|
|
19788
|
+
}
|
|
19580
19789
|
}
|
|
19790
|
+
} catch (error) {
|
|
19791
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
19792
|
+
this.addLogMessage("loading", "", true);
|
|
19793
|
+
this.addLogMessage("error", `Handoff failed: ${errorMsg}`);
|
|
19794
|
+
logger.error("Handoff prompt generation failed:", errorMsg);
|
|
19795
|
+
return;
|
|
19581
19796
|
}
|
|
19582
19797
|
this.addLogMessage("loading", "", true);
|
|
19583
19798
|
if (!generatedPrompt) {
|
|
@@ -21616,6 +21831,10 @@ class EventManager {
|
|
|
21616
21831
|
this.sendToWindows("tool", data);
|
|
21617
21832
|
this.broadcastToEventConnectors("tool", data);
|
|
21618
21833
|
}
|
|
21834
|
+
sendToolInputChunk(data) {
|
|
21835
|
+
this.sendToWindows("tool-input-chunk", data);
|
|
21836
|
+
this.broadcastToEventConnectors("tool-input-chunk", data);
|
|
21837
|
+
}
|
|
21619
21838
|
// User message events
|
|
21620
21839
|
sendUserMessage(data) {
|
|
21621
21840
|
this.sendToWindows("user-message", data);
|
|
@@ -21894,26 +22113,31 @@ const getDefaultModelInfo = (provider, modelId, allModelInfos) => {
|
|
|
21894
22113
|
});
|
|
21895
22114
|
return modelInfo;
|
|
21896
22115
|
};
|
|
21897
|
-
const calculateCost = (model, sentTokens, receivedTokens, cacheReadTokens = 0) => {
|
|
22116
|
+
const calculateCost = (model, sentTokens, receivedTokens, cacheReadTokens = 0, cacheWriteTokens = 0) => {
|
|
21898
22117
|
const inputCostPerToken = model.inputCostPerToken ?? 0;
|
|
21899
22118
|
const outputCostPerToken = model.outputCostPerToken ?? 0;
|
|
21900
22119
|
const cacheReadInputTokenCost = model.cacheReadInputTokenCost ?? inputCostPerToken;
|
|
22120
|
+
const cacheWriteInputTokenCost = model.cacheWriteInputTokenCost ?? 0;
|
|
21901
22121
|
const inputCost = sentTokens * inputCostPerToken;
|
|
21902
22122
|
const outputCost = receivedTokens * outputCostPerToken;
|
|
21903
|
-
const
|
|
22123
|
+
const cacheCreationCost = cacheWriteTokens * cacheWriteInputTokenCost;
|
|
22124
|
+
const cacheReadCost = cacheReadTokens * cacheReadInputTokenCost;
|
|
22125
|
+
const cacheCost = cacheCreationCost + cacheReadCost;
|
|
21904
22126
|
return inputCost + outputCost + cacheCost;
|
|
21905
22127
|
};
|
|
21906
22128
|
const getDefaultUsageReport = (task, provider, model, usage) => {
|
|
21907
22129
|
const totalSentTokens = usage.inputTokens || 0;
|
|
21908
22130
|
const receivedTokens = usage.outputTokens || 0;
|
|
21909
|
-
const cacheReadTokens = usage.
|
|
21910
|
-
const
|
|
21911
|
-
const
|
|
22131
|
+
const cacheReadTokens = usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
22132
|
+
const cacheWriteTokens = usage.inputTokenDetails?.cacheWriteTokens ?? 0;
|
|
22133
|
+
const sentTokens = usage.inputTokenDetails?.noCacheTokens || totalSentTokens - cacheReadTokens;
|
|
22134
|
+
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens, cacheWriteTokens);
|
|
21912
22135
|
return {
|
|
21913
22136
|
model: `${provider.id}/${model.id}`,
|
|
21914
22137
|
sentTokens,
|
|
21915
22138
|
receivedTokens,
|
|
21916
22139
|
cacheReadTokens,
|
|
22140
|
+
cacheWriteTokens,
|
|
21917
22141
|
messageCost,
|
|
21918
22142
|
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
21919
22143
|
};
|
|
@@ -21994,35 +22218,6 @@ const createAnthropicLlm = (profile, model, settings, projectDir) => {
|
|
|
21994
22218
|
});
|
|
21995
22219
|
return anthropicProvider(model.id);
|
|
21996
22220
|
};
|
|
21997
|
-
const calculateAnthropicCost = (model, sentTokens, receivedTokens, cacheWriteTokens = 0, cacheReadTokens = 0) => {
|
|
21998
|
-
const inputCostPerToken = model.inputCostPerToken ?? 0;
|
|
21999
|
-
const outputCostPerToken = model.outputCostPerToken ?? 0;
|
|
22000
|
-
const cacheWriteInputTokenCost = model.cacheWriteInputTokenCost ?? inputCostPerToken;
|
|
22001
|
-
const cacheReadInputTokenCost = model.cacheReadInputTokenCost ?? 0;
|
|
22002
|
-
const inputCost = sentTokens * inputCostPerToken;
|
|
22003
|
-
const outputCost = receivedTokens * outputCostPerToken;
|
|
22004
|
-
const cacheCreationCost = cacheWriteTokens * cacheWriteInputTokenCost;
|
|
22005
|
-
const cacheReadCost = cacheReadTokens * cacheReadInputTokenCost;
|
|
22006
|
-
const cacheCost = cacheCreationCost + cacheReadCost;
|
|
22007
|
-
return inputCost + outputCost + cacheCost;
|
|
22008
|
-
};
|
|
22009
|
-
const getAnthropicUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
22010
|
-
const sentTokens = usage.inputTokens || 0;
|
|
22011
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
22012
|
-
const { anthropic: anthropic2 } = providerMetadata || {};
|
|
22013
|
-
const cacheWriteTokens = anthropic2?.cacheCreationInputTokens ?? 0;
|
|
22014
|
-
const cacheReadTokens = anthropic2?.cacheReadInputTokens ?? usage?.cachedInputTokens ?? 0;
|
|
22015
|
-
const messageCost = calculateAnthropicCost(model, sentTokens, receivedTokens, cacheWriteTokens, cacheReadTokens);
|
|
22016
|
-
return {
|
|
22017
|
-
model: `${provider.id}/${model.id}`,
|
|
22018
|
-
sentTokens,
|
|
22019
|
-
receivedTokens,
|
|
22020
|
-
cacheWriteTokens,
|
|
22021
|
-
cacheReadTokens,
|
|
22022
|
-
messageCost,
|
|
22023
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
22024
|
-
};
|
|
22025
|
-
};
|
|
22026
22221
|
const getAnthropicCacheControl = () => {
|
|
22027
22222
|
return {
|
|
22028
22223
|
providerOptions: {
|
|
@@ -22033,17 +22228,28 @@ const getAnthropicCacheControl = () => {
|
|
|
22033
22228
|
placement: "message"
|
|
22034
22229
|
};
|
|
22035
22230
|
};
|
|
22231
|
+
const getAnthropicProviderOptions = (llmProvider, _model) => {
|
|
22232
|
+
if (!isAnthropicProvider(llmProvider)) {
|
|
22233
|
+
return void 0;
|
|
22234
|
+
}
|
|
22235
|
+
return {
|
|
22236
|
+
anthropic: {
|
|
22237
|
+
thinking: { type: "adaptive", display: "summarized" }
|
|
22238
|
+
}
|
|
22239
|
+
};
|
|
22240
|
+
};
|
|
22036
22241
|
const anthropicProviderStrategy = {
|
|
22037
22242
|
// Core LLM functions
|
|
22038
22243
|
createLlm: createAnthropicLlm,
|
|
22039
|
-
getUsageReport:
|
|
22244
|
+
getUsageReport: getDefaultUsageReport,
|
|
22040
22245
|
// Model discovery functions
|
|
22041
22246
|
loadModels: loadAnthropicModels,
|
|
22042
22247
|
hasEnvVars: hasAnthropicEnvVars,
|
|
22043
22248
|
getAiderMapping: getAnthropicAiderMapping,
|
|
22044
22249
|
getModelInfo: getDefaultModelInfo,
|
|
22045
22250
|
// Configuration helpers
|
|
22046
|
-
getCacheControl: getAnthropicCacheControl
|
|
22251
|
+
getCacheControl: getAnthropicCacheControl,
|
|
22252
|
+
getProviderOptions: getAnthropicProviderOptions
|
|
22047
22253
|
};
|
|
22048
22254
|
const ensureV1Suffix = (baseUrl) => {
|
|
22049
22255
|
return baseUrl.endsWith("/v1") ? baseUrl : `${baseUrl}/v1`;
|
|
@@ -22153,16 +22359,27 @@ const createAnthropicCompatibleLlm = (profile, model, settings, projectDir) => {
|
|
|
22153
22359
|
});
|
|
22154
22360
|
return anthropicProvider(model.id);
|
|
22155
22361
|
};
|
|
22362
|
+
const getAnthropicCompatibleProviderOptions = (llmProvider, _model) => {
|
|
22363
|
+
if (!isAnthropicCompatibleProvider(llmProvider)) {
|
|
22364
|
+
return void 0;
|
|
22365
|
+
}
|
|
22366
|
+
return {
|
|
22367
|
+
anthropic: {
|
|
22368
|
+
thinking: { type: "adaptive", display: "summarized" }
|
|
22369
|
+
}
|
|
22370
|
+
};
|
|
22371
|
+
};
|
|
22156
22372
|
const anthropicCompatibleProviderStrategy = {
|
|
22157
22373
|
// Core LLM functions
|
|
22158
22374
|
createLlm: createAnthropicCompatibleLlm,
|
|
22159
|
-
getUsageReport:
|
|
22375
|
+
getUsageReport: getDefaultUsageReport,
|
|
22160
22376
|
// Model discovery functions
|
|
22161
22377
|
loadModels: loadAnthropicCompatibleModels,
|
|
22162
22378
|
hasEnvVars: hasAnthropicCompatibleEnvVars,
|
|
22163
22379
|
getAiderMapping: getAnthropicCompatibleAiderMapping,
|
|
22164
22380
|
// Cache control
|
|
22165
|
-
getCacheControl: getAnthropicCacheControl
|
|
22381
|
+
getCacheControl: getAnthropicCacheControl,
|
|
22382
|
+
getProviderOptions: getAnthropicCompatibleProviderOptions
|
|
22166
22383
|
};
|
|
22167
22384
|
const extractResourceNameFromEndpoint = (endpoint) => {
|
|
22168
22385
|
try {
|
|
@@ -22230,22 +22447,6 @@ const createAzureLlm = (profile, model, settings, projectDir) => {
|
|
|
22230
22447
|
});
|
|
22231
22448
|
return azureProvider.responses(model.id);
|
|
22232
22449
|
};
|
|
22233
|
-
const getAzureUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
22234
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
22235
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
22236
|
-
const { openai: openai2 } = providerMetadata || {};
|
|
22237
|
-
const cacheReadTokens = openai2?.cachedPromptTokens ?? usage.cachedInputTokens ?? 0;
|
|
22238
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
22239
|
-
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
|
|
22240
|
-
return {
|
|
22241
|
-
model: `${provider.id}/${model.id}`,
|
|
22242
|
-
sentTokens,
|
|
22243
|
-
receivedTokens,
|
|
22244
|
-
cacheReadTokens,
|
|
22245
|
-
messageCost,
|
|
22246
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
22247
|
-
};
|
|
22248
|
-
};
|
|
22249
22450
|
const getAzureProviderOptions = (llmProvider, model) => {
|
|
22250
22451
|
if (isAzureProvider(llmProvider)) {
|
|
22251
22452
|
const providerOverrides = model.providerOverrides;
|
|
@@ -22284,7 +22485,7 @@ const getAzureProviderParameters = (llmProvider, model) => {
|
|
|
22284
22485
|
const azureProviderStrategy = {
|
|
22285
22486
|
// Core LLM functions
|
|
22286
22487
|
createLlm: createAzureLlm,
|
|
22287
|
-
getUsageReport:
|
|
22488
|
+
getUsageReport: getDefaultUsageReport,
|
|
22288
22489
|
// Model discovery functions
|
|
22289
22490
|
loadModels: async () => ({
|
|
22290
22491
|
models: [],
|
|
@@ -22980,29 +23181,20 @@ const createGeminiLlm = (profile, model, settings, projectDir) => {
|
|
|
22980
23181
|
logger.debug(`Loaded GEMINI_API_BASE_URL from ${effectiveBaseUrl.source}`);
|
|
22981
23182
|
}
|
|
22982
23183
|
}
|
|
22983
|
-
const googleProvider = google.
|
|
23184
|
+
const googleProvider = google.createGoogle({
|
|
22984
23185
|
apiKey,
|
|
22985
23186
|
baseURL: baseUrl || void 0,
|
|
22986
23187
|
headers: profile.headers
|
|
22987
23188
|
});
|
|
22988
23189
|
return googleProvider(model.id);
|
|
22989
23190
|
};
|
|
22990
|
-
const calculateGeminiCost = (model, sentTokens, receivedTokens, cacheReadTokens = 0) => {
|
|
22991
|
-
const inputCostPerToken = model.inputCostPerToken ?? 0;
|
|
22992
|
-
const outputCostPerToken = model.outputCostPerToken ?? 0;
|
|
22993
|
-
const cacheReadInputTokenCost = model.cacheReadInputTokenCost ?? inputCostPerToken * 0.25;
|
|
22994
|
-
const inputCost = sentTokens * inputCostPerToken;
|
|
22995
|
-
const outputCost = receivedTokens * outputCostPerToken;
|
|
22996
|
-
const cacheCost = cacheReadTokens * cacheReadInputTokenCost;
|
|
22997
|
-
return inputCost + outputCost + cacheCost;
|
|
22998
|
-
};
|
|
22999
23191
|
const getGeminiUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
23000
23192
|
const totalSentTokens = usage.inputTokens || 0;
|
|
23001
23193
|
const receivedTokens = usage.outputTokens || 0;
|
|
23002
23194
|
const { google: google2 } = providerMetadata || {};
|
|
23003
|
-
const cacheReadTokens = google2?.
|
|
23195
|
+
const cacheReadTokens = google2?.cachedContentTokenCount ?? usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
23004
23196
|
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
23005
|
-
const messageCost =
|
|
23197
|
+
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
|
|
23006
23198
|
return {
|
|
23007
23199
|
model: `${provider.id}/${model.id}`,
|
|
23008
23200
|
sentTokens,
|
|
@@ -23239,25 +23431,10 @@ const createGpustackLlm = (profile, model, settings, projectDir) => {
|
|
|
23239
23431
|
});
|
|
23240
23432
|
return compatibleProvider(model.id);
|
|
23241
23433
|
};
|
|
23242
|
-
const getGpustackUsageReport = (task, provider, model, usage) => {
|
|
23243
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
23244
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
23245
|
-
const cacheReadTokens = usage.cachedInputTokens || 0;
|
|
23246
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
23247
|
-
const messageCost = 0;
|
|
23248
|
-
return {
|
|
23249
|
-
model: `${provider.id}/${model.id}`,
|
|
23250
|
-
sentTokens,
|
|
23251
|
-
receivedTokens,
|
|
23252
|
-
cacheReadTokens,
|
|
23253
|
-
messageCost,
|
|
23254
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
23255
|
-
};
|
|
23256
|
-
};
|
|
23257
23434
|
const gpustackProviderStrategy = {
|
|
23258
23435
|
// Core LLM functions
|
|
23259
23436
|
createLlm: createGpustackLlm,
|
|
23260
|
-
getUsageReport:
|
|
23437
|
+
getUsageReport: getDefaultUsageReport,
|
|
23261
23438
|
// Model discovery functions
|
|
23262
23439
|
loadModels: loadGpustackModels,
|
|
23263
23440
|
hasEnvVars: hasGpustackEnvVars,
|
|
@@ -23522,7 +23699,7 @@ const createKimiPlanLlm = (profile, model, settings, projectDir) => {
|
|
|
23522
23699
|
const kimiPlanProviderStrategy = {
|
|
23523
23700
|
// Core LLM functions
|
|
23524
23701
|
createLlm: createKimiPlanLlm,
|
|
23525
|
-
getUsageReport:
|
|
23702
|
+
getUsageReport: getDefaultUsageReport,
|
|
23526
23703
|
// Model discovery functions
|
|
23527
23704
|
loadModels: loadKimiPlanModels,
|
|
23528
23705
|
hasEnvVars: hasKimiPlanEnvVars,
|
|
@@ -23739,25 +23916,10 @@ const createLmStudioLlm = (profile, model, settings, projectDir) => {
|
|
|
23739
23916
|
});
|
|
23740
23917
|
return lmStudioProvider(model.id);
|
|
23741
23918
|
};
|
|
23742
|
-
const getLmStudioUsageReport = (task, provider, model, usage) => {
|
|
23743
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
23744
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
23745
|
-
const cacheReadTokens = usage.cachedInputTokens || 0;
|
|
23746
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
23747
|
-
const messageCost = 0;
|
|
23748
|
-
return {
|
|
23749
|
-
model: `${provider.id}/${model.id}`,
|
|
23750
|
-
sentTokens,
|
|
23751
|
-
receivedTokens,
|
|
23752
|
-
cacheReadTokens,
|
|
23753
|
-
messageCost,
|
|
23754
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
23755
|
-
};
|
|
23756
|
-
};
|
|
23757
23919
|
const lmStudioProviderStrategy = {
|
|
23758
23920
|
// Core LLM functions
|
|
23759
23921
|
createLlm: createLmStudioLlm,
|
|
23760
|
-
getUsageReport:
|
|
23922
|
+
getUsageReport: getDefaultUsageReport,
|
|
23761
23923
|
// Model discovery functions
|
|
23762
23924
|
loadModels: loadLmStudioModels,
|
|
23763
23925
|
hasEnvVars: hasLmStudioEnvVars,
|
|
@@ -23926,36 +24088,6 @@ const createMinimaxLlm = (profile, model, settings, projectDir) => {
|
|
|
23926
24088
|
});
|
|
23927
24089
|
return anthropicProvider(model.id);
|
|
23928
24090
|
};
|
|
23929
|
-
const calculateMinimaxCost = (model, sentTokens, receivedTokens, cacheWriteTokens = 0, cacheReadTokens = 0) => {
|
|
23930
|
-
const inputCostPerToken = model.inputCostPerToken ?? 0;
|
|
23931
|
-
const outputCostPerToken = model.outputCostPerToken ?? 0;
|
|
23932
|
-
const cacheWriteInputTokenCost = model.cacheWriteInputTokenCost ?? inputCostPerToken;
|
|
23933
|
-
const cacheReadInputTokenCost = model.cacheReadInputTokenCost ?? 0;
|
|
23934
|
-
const inputCost = sentTokens * inputCostPerToken;
|
|
23935
|
-
const outputCost = receivedTokens * outputCostPerToken;
|
|
23936
|
-
const cacheCreationCost = cacheWriteTokens * cacheWriteInputTokenCost;
|
|
23937
|
-
const cacheReadCost = cacheReadTokens * cacheReadInputTokenCost;
|
|
23938
|
-
const cacheCost = cacheCreationCost + cacheReadCost;
|
|
23939
|
-
return inputCost + outputCost + cacheCost;
|
|
23940
|
-
};
|
|
23941
|
-
const getMinimaxUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
23942
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
23943
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
23944
|
-
const { anthropic: anthropic2 } = providerMetadata || {};
|
|
23945
|
-
const cacheWriteTokens = anthropic2?.cacheCreationInputTokens ?? 0;
|
|
23946
|
-
const cacheReadTokens = anthropic2?.cacheReadInputTokens ?? usage?.cachedInputTokens ?? 0;
|
|
23947
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
23948
|
-
const messageCost = calculateMinimaxCost(model, sentTokens, receivedTokens, cacheWriteTokens, cacheReadTokens);
|
|
23949
|
-
return {
|
|
23950
|
-
model: `${provider.id}/${model.id}`,
|
|
23951
|
-
sentTokens,
|
|
23952
|
-
receivedTokens,
|
|
23953
|
-
cacheWriteTokens,
|
|
23954
|
-
cacheReadTokens,
|
|
23955
|
-
messageCost,
|
|
23956
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
23957
|
-
};
|
|
23958
|
-
};
|
|
23959
24091
|
const getMinimaxCacheControl = () => {
|
|
23960
24092
|
return {
|
|
23961
24093
|
providerOptions: {
|
|
@@ -23966,16 +24098,27 @@ const getMinimaxCacheControl = () => {
|
|
|
23966
24098
|
placement: "message"
|
|
23967
24099
|
};
|
|
23968
24100
|
};
|
|
24101
|
+
const getMinimaxProviderOptions = (llmProvider, _model) => {
|
|
24102
|
+
if (!isMinimaxProvider(llmProvider)) {
|
|
24103
|
+
return void 0;
|
|
24104
|
+
}
|
|
24105
|
+
return {
|
|
24106
|
+
anthropic: {
|
|
24107
|
+
thinking: { type: "adaptive", display: "summarized" }
|
|
24108
|
+
}
|
|
24109
|
+
};
|
|
24110
|
+
};
|
|
23969
24111
|
const minimaxProviderStrategy = {
|
|
23970
24112
|
// Core LLM functions
|
|
23971
24113
|
createLlm: createMinimaxLlm,
|
|
23972
|
-
getUsageReport:
|
|
24114
|
+
getUsageReport: getDefaultUsageReport,
|
|
23973
24115
|
// Model discovery functions
|
|
23974
24116
|
loadModels: loadMinimaxModels,
|
|
23975
24117
|
hasEnvVars: hasMinimaxEnvVars,
|
|
23976
24118
|
getAiderMapping: getMinimaxAiderMapping,
|
|
23977
24119
|
// Configuration helpers
|
|
23978
|
-
getCacheControl: getMinimaxCacheControl
|
|
24120
|
+
getCacheControl: getMinimaxCacheControl,
|
|
24121
|
+
getProviderOptions: getMinimaxProviderOptions
|
|
23979
24122
|
};
|
|
23980
24123
|
const loadMistralModels = async (profile, settings) => {
|
|
23981
24124
|
if (!isMistralProvider(profile.provider)) {
|
|
@@ -24145,25 +24288,6 @@ const createNeuralwattLlm = (profile, model, settings, projectDir) => {
|
|
|
24145
24288
|
});
|
|
24146
24289
|
return compatibleProvider(model.id);
|
|
24147
24290
|
};
|
|
24148
|
-
const getNeuralwattUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
24149
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
24150
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
24151
|
-
const cacheReadTokens = usage.cachedInputTokens || 0;
|
|
24152
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
24153
|
-
logger.info("Neuralwatt usage report", {
|
|
24154
|
-
providerMetadata,
|
|
24155
|
-
usage
|
|
24156
|
-
});
|
|
24157
|
-
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
|
|
24158
|
-
return {
|
|
24159
|
-
model: `${provider.id}/${model.id}`,
|
|
24160
|
-
sentTokens,
|
|
24161
|
-
receivedTokens,
|
|
24162
|
-
cacheReadTokens,
|
|
24163
|
-
messageCost,
|
|
24164
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
24165
|
-
};
|
|
24166
|
-
};
|
|
24167
24291
|
const getNeuralwattProviderOptions = (llmProvider, model) => {
|
|
24168
24292
|
if (!isNeuralwattProvider(llmProvider)) {
|
|
24169
24293
|
return void 0;
|
|
@@ -24183,7 +24307,7 @@ const getNeuralwattProviderOptions = (llmProvider, model) => {
|
|
|
24183
24307
|
};
|
|
24184
24308
|
const neuralwattProviderStrategy = {
|
|
24185
24309
|
createLlm: createNeuralwattLlm,
|
|
24186
|
-
getUsageReport:
|
|
24310
|
+
getUsageReport: getDefaultUsageReport,
|
|
24187
24311
|
loadModels: loadNeuralwattModels,
|
|
24188
24312
|
hasEnvVars: hasNeuralwattEnvVars,
|
|
24189
24313
|
getAiderMapping: getNeuralwattAiderMapping,
|
|
@@ -24268,25 +24392,10 @@ const createOllamaLlm = (profile, model, settings, projectDir) => {
|
|
|
24268
24392
|
middleware: ai.simulateStreamingMiddleware()
|
|
24269
24393
|
});
|
|
24270
24394
|
};
|
|
24271
|
-
const getOllamaUsageReport = (task, provider, model, usage) => {
|
|
24272
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
24273
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
24274
|
-
const cacheReadTokens = usage.cachedInputTokens || 0;
|
|
24275
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
24276
|
-
const messageCost = 0;
|
|
24277
|
-
return {
|
|
24278
|
-
model: `${provider.id}/${model.id}`,
|
|
24279
|
-
sentTokens,
|
|
24280
|
-
receivedTokens,
|
|
24281
|
-
cacheReadTokens,
|
|
24282
|
-
messageCost,
|
|
24283
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
24284
|
-
};
|
|
24285
|
-
};
|
|
24286
24395
|
const ollamaProviderStrategy = {
|
|
24287
24396
|
// Core LLM functions
|
|
24288
24397
|
createLlm: createOllamaLlm,
|
|
24289
|
-
getUsageReport:
|
|
24398
|
+
getUsageReport: getDefaultUsageReport,
|
|
24290
24399
|
// Model discovery functions
|
|
24291
24400
|
loadModels: loadOllamaModels,
|
|
24292
24401
|
hasEnvVars: hasOllamaEnvVars,
|
|
@@ -24384,22 +24493,6 @@ const createOpenAiLlm = (profile, model, settings, projectDir) => {
|
|
|
24384
24493
|
});
|
|
24385
24494
|
return openAIProvider(model.id);
|
|
24386
24495
|
};
|
|
24387
|
-
const getOpenAiUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
24388
|
-
const totalSentTokens = usage.inputTokens || 0;
|
|
24389
|
-
const receivedTokens = usage.outputTokens || 0;
|
|
24390
|
-
const { openai: openai2 } = providerMetadata || {};
|
|
24391
|
-
const cacheReadTokens = openai2?.cachedPromptTokens ?? usage.cachedInputTokens ?? 0;
|
|
24392
|
-
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
24393
|
-
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
|
|
24394
|
-
return {
|
|
24395
|
-
model: `${provider.id}/${model.id}`,
|
|
24396
|
-
sentTokens,
|
|
24397
|
-
receivedTokens,
|
|
24398
|
-
cacheReadTokens,
|
|
24399
|
-
messageCost,
|
|
24400
|
-
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
24401
|
-
};
|
|
24402
|
-
};
|
|
24403
24496
|
const getOpenAiProviderOptions = (provider, model) => {
|
|
24404
24497
|
if (!isOpenAiProvider(provider)) {
|
|
24405
24498
|
return void 0;
|
|
@@ -24515,7 +24608,7 @@ const createOpenAIVoiceSession = async (profile, settings) => {
|
|
|
24515
24608
|
const openaiProviderStrategy = {
|
|
24516
24609
|
// Core LLM functions
|
|
24517
24610
|
createLlm: createOpenAiLlm,
|
|
24518
|
-
getUsageReport:
|
|
24611
|
+
getUsageReport: getDefaultUsageReport,
|
|
24519
24612
|
// Model discovery functions
|
|
24520
24613
|
loadModels: loadOpenAiModels,
|
|
24521
24614
|
hasEnvVars: hasOpenAiEnvVars,
|
|
@@ -24782,7 +24875,7 @@ const createOpencodeLlm = (profile, model, settings, projectDir) => {
|
|
|
24782
24875
|
return anthropic$1(modelId);
|
|
24783
24876
|
}
|
|
24784
24877
|
case "gemini": {
|
|
24785
|
-
const google$1 = google.
|
|
24878
|
+
const google$1 = google.createGoogle({
|
|
24786
24879
|
apiKey,
|
|
24787
24880
|
baseURL: ENDPOINT_BASE_URL,
|
|
24788
24881
|
headers: profile.headers
|
|
@@ -24935,15 +25028,17 @@ const createOpenRouterLlm = (profile, model, settings, projectDir) => {
|
|
|
24935
25028
|
const getOpenRouterUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
24936
25029
|
const totalSentTokens = usage.inputTokens || 0;
|
|
24937
25030
|
const receivedTokens = usage.outputTokens || 0;
|
|
24938
|
-
const { openrouter } = providerMetadata;
|
|
24939
|
-
const cacheReadTokens = openrouter
|
|
25031
|
+
const { openrouter } = providerMetadata || {};
|
|
25032
|
+
const cacheReadTokens = usage.inputTokenDetails?.cacheReadTokens ?? openrouter?.usage?.promptTokensDetails?.cachedTokens ?? 0;
|
|
25033
|
+
const cacheWriteTokens = usage.inputTokenDetails?.cacheWriteTokens ?? 0;
|
|
24940
25034
|
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
24941
|
-
const messageCost = openrouter
|
|
25035
|
+
const messageCost = openrouter?.usage?.cost ?? calculateCost(model, sentTokens, receivedTokens, cacheReadTokens, cacheWriteTokens);
|
|
24942
25036
|
return {
|
|
24943
25037
|
model: `${provider.id}/${model.id}`,
|
|
24944
25038
|
sentTokens,
|
|
24945
25039
|
receivedTokens,
|
|
24946
25040
|
cacheReadTokens,
|
|
25041
|
+
cacheWriteTokens,
|
|
24947
25042
|
messageCost,
|
|
24948
25043
|
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
24949
25044
|
};
|
|
@@ -25110,7 +25205,7 @@ const getRequestyUsageReport = (task, provider, model, usage, providerMetadata)
|
|
|
25110
25205
|
const cacheWriteTokens = requesty?.usage?.cachingTokens ?? 0;
|
|
25111
25206
|
const cacheReadTokens = requesty?.usage?.cachedTokens ?? 0;
|
|
25112
25207
|
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
25113
|
-
const messageCost =
|
|
25208
|
+
const messageCost = calculateRequestyCost(model, sentTokens, receivedTokens, cacheWriteTokens, cacheReadTokens);
|
|
25114
25209
|
return {
|
|
25115
25210
|
model: `${provider.id}/${model.id}`,
|
|
25116
25211
|
sentTokens,
|
|
@@ -25361,23 +25456,14 @@ const createVertexAiLlm = (profile, model, settings, projectDir) => {
|
|
|
25361
25456
|
});
|
|
25362
25457
|
return vertexProvider(model.id);
|
|
25363
25458
|
};
|
|
25364
|
-
const calculateVertexAiCost = (model, sentTokens, receivedTokens, cacheReadTokens = 0) => {
|
|
25365
|
-
const inputCostPerToken = model.inputCostPerToken ?? 0;
|
|
25366
|
-
const outputCostPerToken = model.outputCostPerToken ?? 0;
|
|
25367
|
-
const cacheReadInputTokenCost = model.cacheReadInputTokenCost ?? inputCostPerToken * 0.25;
|
|
25368
|
-
const inputCost = sentTokens * inputCostPerToken;
|
|
25369
|
-
const outputCost = receivedTokens * outputCostPerToken;
|
|
25370
|
-
const cacheCost = cacheReadTokens * cacheReadInputTokenCost;
|
|
25371
|
-
return inputCost + outputCost + cacheCost;
|
|
25372
|
-
};
|
|
25373
25459
|
const getVertexAiUsageReport = (task, provider, model, usage, providerMetadata) => {
|
|
25374
25460
|
const totalSentTokens = usage.inputTokens || 0;
|
|
25375
25461
|
const receivedTokens = usage.outputTokens || 0;
|
|
25376
|
-
const {
|
|
25377
|
-
const cacheReadTokens =
|
|
25462
|
+
const { vertex } = providerMetadata || {};
|
|
25463
|
+
const cacheReadTokens = vertex?.cachedContentTokenCount ?? usage.inputTokenDetails?.cacheReadTokens ?? 0;
|
|
25378
25464
|
const sentTokens = totalSentTokens - cacheReadTokens;
|
|
25379
|
-
const messageCost =
|
|
25380
|
-
|
|
25465
|
+
const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
|
|
25466
|
+
return {
|
|
25381
25467
|
model: `${provider.id}/${model.id}`,
|
|
25382
25468
|
sentTokens,
|
|
25383
25469
|
receivedTokens,
|
|
@@ -25385,7 +25471,6 @@ const getVertexAiUsageReport = (task, provider, model, usage, providerMetadata)
|
|
|
25385
25471
|
messageCost,
|
|
25386
25472
|
agentTotalCost: task.task.agentTotalCost + messageCost
|
|
25387
25473
|
};
|
|
25388
|
-
return usageReportData;
|
|
25389
25474
|
};
|
|
25390
25475
|
const getVertexAiProviderOptions = (llmProvider, model) => {
|
|
25391
25476
|
if (isVertexAiProvider(llmProvider)) {
|
|
@@ -25393,7 +25478,7 @@ const getVertexAiProviderOptions = (llmProvider, model) => {
|
|
|
25393
25478
|
const includeThoughts = providerOverrides?.includeThoughts ?? llmProvider.includeThoughts;
|
|
25394
25479
|
const thinkingBudget = providerOverrides?.thinkingBudget ?? llmProvider.thinkingBudget;
|
|
25395
25480
|
return {
|
|
25396
|
-
|
|
25481
|
+
vertex: {
|
|
25397
25482
|
...(includeThoughts || thinkingBudget) && {
|
|
25398
25483
|
thinkingConfig: {
|
|
25399
25484
|
includeThoughts: includeThoughts && (thinkingBudget ?? 0) > 0,
|
|
@@ -25506,23 +25591,32 @@ const getZaiPlanProviderOptions = (llmProvider, model) => {
|
|
|
25506
25591
|
const providerOverrides = model.providerOverrides;
|
|
25507
25592
|
const thinkingEnabled = providerOverrides?.thinkingEnabled ?? llmProvider.thinkingEnabled ?? true;
|
|
25508
25593
|
const reasoningEffort = providerOverrides?.reasoningEffort ?? llmProvider.reasoningEffort ?? ReasoningEffort.Max;
|
|
25594
|
+
const toolCallStreamingDisabled = providerOverrides?.disableToolCallStreaming ?? llmProvider.disableToolCallStreaming ?? false;
|
|
25595
|
+
const toolStreamOption = toolCallStreamingDisabled ? {} : { tool_stream: true };
|
|
25509
25596
|
if (thinkingEnabled === false) {
|
|
25510
25597
|
return {
|
|
25511
|
-
|
|
25598
|
+
zaiPlan: {
|
|
25512
25599
|
thinking: {
|
|
25513
25600
|
type: "disabled"
|
|
25514
|
-
}
|
|
25601
|
+
},
|
|
25602
|
+
...toolStreamOption
|
|
25515
25603
|
}
|
|
25516
25604
|
};
|
|
25517
25605
|
}
|
|
25518
25606
|
const mappedReasoningEffort = reasoningEffort === ReasoningEffort.None ? void 0 : reasoningEffort.toLowerCase();
|
|
25519
25607
|
if (mappedReasoningEffort) {
|
|
25520
25608
|
return {
|
|
25521
|
-
|
|
25522
|
-
reasoningEffort: mappedReasoningEffort
|
|
25609
|
+
zaiPlan: {
|
|
25610
|
+
reasoningEffort: mappedReasoningEffort,
|
|
25611
|
+
...toolStreamOption
|
|
25523
25612
|
}
|
|
25524
25613
|
};
|
|
25525
25614
|
}
|
|
25615
|
+
if (Object.keys(toolStreamOption).length > 0) {
|
|
25616
|
+
return {
|
|
25617
|
+
zaiPlan: toolStreamOption
|
|
25618
|
+
};
|
|
25619
|
+
}
|
|
25526
25620
|
}
|
|
25527
25621
|
return void 0;
|
|
25528
25622
|
};
|
|
@@ -26132,6 +26226,15 @@ class ModelManager {
|
|
|
26132
26226
|
}
|
|
26133
26227
|
return typeof modelObj.providerOverrides?.disableStreaming === "boolean" ? modelObj.providerOverrides.disableStreaming : llmProvider.disableStreaming ?? false;
|
|
26134
26228
|
}
|
|
26229
|
+
isToolCallStreamingDisabled(provider, modelId) {
|
|
26230
|
+
const llmProvider = provider.provider;
|
|
26231
|
+
const models = this.providerModels[provider.id] || [];
|
|
26232
|
+
const modelObj = models.find((m) => m.id === modelId);
|
|
26233
|
+
if (!modelObj) {
|
|
26234
|
+
return llmProvider.disableToolCallStreaming ?? false;
|
|
26235
|
+
}
|
|
26236
|
+
return typeof modelObj.providerOverrides?.disableToolCallStreaming === "boolean" ? modelObj.providerOverrides.disableToolCallStreaming : llmProvider.disableToolCallStreaming ?? false;
|
|
26237
|
+
}
|
|
26135
26238
|
getProviderOptions(provider, modelId) {
|
|
26136
26239
|
const llmProvider = provider.provider;
|
|
26137
26240
|
const strategy = this.providerRegistry[llmProvider.name];
|
|
@@ -29077,7 +29180,8 @@ class ExtensionManager {
|
|
|
29077
29180
|
return await tool2.execute(input2, {
|
|
29078
29181
|
toolCallId: "",
|
|
29079
29182
|
abortSignal: abortSignal || options.abortSignal,
|
|
29080
|
-
messages: []
|
|
29183
|
+
messages: [],
|
|
29184
|
+
context: void 0
|
|
29081
29185
|
});
|
|
29082
29186
|
} else {
|
|
29083
29187
|
return "Tool does not have an execute function";
|
|
@@ -30186,6 +30290,9 @@ class EventsHandler {
|
|
|
30186
30290
|
}
|
|
30187
30291
|
return task.getAllFiles(useGit);
|
|
30188
30292
|
}
|
|
30293
|
+
async refreshContextFiles(baseDir, taskId) {
|
|
30294
|
+
await this.projectManager.getProject(baseDir).getTask(taskId)?.refreshContextFiles();
|
|
30295
|
+
}
|
|
30189
30296
|
async getUpdatedFiles(baseDir, taskId) {
|
|
30190
30297
|
const task = this.projectManager.getProject(baseDir).getTask(taskId);
|
|
30191
30298
|
if (!task) {
|
|
@@ -30446,7 +30553,8 @@ class EventsHandler {
|
|
|
30446
30553
|
}
|
|
30447
30554
|
async readFile(baseDir, taskId, filePath) {
|
|
30448
30555
|
const task = this.projectManager.getProject(baseDir).getTask(taskId);
|
|
30449
|
-
const
|
|
30556
|
+
const expandedPath = expandTilde(filePath);
|
|
30557
|
+
const absolutePath = path.isAbsolute(expandedPath) ? expandedPath : task ? await task.resolveContextFilePath(expandedPath) ?? path.join(baseDir, expandedPath) : path.join(baseDir, expandedPath);
|
|
30450
30558
|
const fileContentBuffer = await fs.readFile(absolutePath);
|
|
30451
30559
|
if (istextorbinary.isBinary(filePath, fileContentBuffer)) {
|
|
30452
30560
|
throw new Error("Cannot read binary file");
|