@aiderdesk/aiderdesk 0.79.0 → 0.79.1
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/renderer/assets/{AgentSettings-CszvCubk.js → AgentSettings-DlLAuLnM.js} +2 -2
- package/out/renderer/assets/{InfoIcon-CitcCe35.js → InfoIcon-C1TeBp5L.js} +1 -1
- package/out/renderer/assets/{Onboarding-C76MB4m2.js → Onboarding-Dh8FRGur.js} +4 -4
- package/out/renderer/assets/{ProviderHeader-D8Qbh28U.js → ProviderHeader-VLzB9p23.js} +277 -64
- package/out/renderer/assets/{SettingsPage-BlzoIUMQ.js → SettingsPage-B3CLZ8tc.js} +3 -3
- package/out/renderer/assets/{UsageDashboard-CbhoXiPL.js → UsageDashboard-D83T3HwC.js} +3 -3
- package/out/renderer/assets/{abnfDiagram-N423BO3Z-CZPdeX6B.js → abnfDiagram-N423BO3Z-BRDZM1mW.js} +4 -4
- package/out/renderer/assets/{arc-Bkalrz-a.js → arc-CbzEqNM1.js} +1 -1
- package/out/renderer/assets/{architectureDiagram-T3A2C74G-DRz1QqO-.js → architectureDiagram-T3A2C74G-Bvd5Je3R.js} +3 -3
- package/out/renderer/assets/{blockDiagram-VBNYF7ZC-ChyfuGgN.js → blockDiagram-VBNYF7ZC-C_NaWxTi.js} +4 -4
- package/out/renderer/assets/{c4Diagram-5PPSVZJV-cVQQcFY5.js → c4Diagram-5PPSVZJV-DguNzZCo.js} +2 -2
- package/out/renderer/assets/{channel-JT6nJyaa.js → channel-Cnrvb6bA.js} +1 -1
- package/out/renderer/assets/{chunk-2GRJ4B5K-J57iiDk9.js → chunk-2GRJ4B5K-r99iLppH.js} +1 -1
- package/out/renderer/assets/{chunk-2Q5K7J3B-B1gn3lFx.js → chunk-2Q5K7J3B-C3uutlD6.js} +1 -1
- package/out/renderer/assets/{chunk-5RXB4S5H-D9R8uVKF.js → chunk-5RXB4S5H-CR6Mx5Iz.js} +4 -4
- package/out/renderer/assets/{chunk-5VM5RSS4-BgMI8UGI.js → chunk-5VM5RSS4-X7PVl-ef.js} +1 -1
- package/out/renderer/assets/{chunk-6Q2QTUOP-Cf4SRUsg.js → chunk-6Q2QTUOP-JehvOsAC.js} +1 -1
- package/out/renderer/assets/{chunk-GF5L2VYU-BrPkeiRK.js → chunk-GF5L2VYU-B3ppa4PP.js} +5 -5
- package/out/renderer/assets/{chunk-JWPE2WC7-BF4fubDx.js → chunk-JWPE2WC7-CFZRPI77.js} +1 -1
- package/out/renderer/assets/{chunk-KBJHAD2P-BrT2h0P-.js → chunk-KBJHAD2P-BBjc6zok.js} +1 -1
- package/out/renderer/assets/{chunk-RYQCIY6F-nKwtNsyW.js → chunk-RYQCIY6F-BZvHC_mQ.js} +3 -3
- package/out/renderer/assets/{chunk-XXDRQBXY-DOR8tcZA.js → chunk-XXDRQBXY-Ck-RRkxC.js} +1 -1
- package/out/renderer/assets/{classDiagram-JCYQIIEL-Ds-LjZkS.js → classDiagram-JCYQIIEL-NNfXWT4B.js} +6 -6
- package/out/renderer/assets/{classDiagram-v2-OCEON4UE-Ds-LjZkS.js → classDiagram-v2-OCEON4UE-NNfXWT4B.js} +6 -6
- package/out/renderer/assets/{cose-bilkent-JH36ORCC-D8MD1ldA.js → cose-bilkent-JH36ORCC-CViVoXgl.js} +1 -1
- package/out/renderer/assets/{cynefin-VYW2F7L2-BWrc0sIz.js → cynefin-VYW2F7L2-DX5D0uIU.js} +1 -1
- package/out/renderer/assets/{cynefinDiagram-MW4NZA55-ajJaFM05.js → cynefinDiagram-MW4NZA55-Cp2wCsOt.js} +3 -3
- package/out/renderer/assets/{dagre-VZM6K2ZE-B7P2-yI-.js → dagre-VZM6K2ZE-eNIYYO0O.js} +5 -5
- package/out/renderer/assets/{diagram-7IWD3JNH-C9b2ycWt.js → diagram-7IWD3JNH-Bg1vGWhI.js} +4 -4
- package/out/renderer/assets/{diagram-B4RE2ZJO-BzexvLYA.js → diagram-B4RE2ZJO-D_JxirT4.js} +3 -3
- package/out/renderer/assets/{diagram-LBJQPF4R-BW3cIhvw.js → diagram-LBJQPF4R-LQpr0xek.js} +3 -3
- package/out/renderer/assets/{diagram-Q27KOJAE-CrI04NBR.js → diagram-Q27KOJAE-BL-MLj4m.js} +4 -4
- package/out/renderer/assets/{diagram-UB23O5K3-Cix1_1dv.js → diagram-UB23O5K3-BlUt9ZmL.js} +3 -3
- package/out/renderer/assets/{ebnfDiagram-BXEA7PRR-yn5BxQJj.js → ebnfDiagram-BXEA7PRR-BGckdM6s.js} +4 -4
- package/out/renderer/assets/{erDiagram-JOGREHBK-CkQ8CtS_.js → erDiagram-JOGREHBK-DmWOmMZk.js} +4 -4
- package/out/renderer/assets/{flowDiagram-UKHOOZJN-08k0gH-d.js → flowDiagram-UKHOOZJN-lOEUIjdB.js} +6 -6
- package/out/renderer/assets/{ganttDiagram-PKOTCBZU-D5qJmakg.js → ganttDiagram-PKOTCBZU-CZtmjxYB.js} +3 -3
- package/out/renderer/assets/{gitGraphDiagram-DS77QQ5N-CPw_BIbi.js → gitGraphDiagram-DS77QQ5N-DE5y9iux.js} +4 -4
- package/out/renderer/assets/{graph-vAJQKSey.js → graph-DSMw-VBh.js} +1 -1
- package/out/renderer/assets/{index-BzofAPMG.js → index--__lgq6v.js} +1 -1
- package/out/renderer/assets/{index-BvQIBR-c.js → index-1JC2_Wd3.js} +2 -2
- package/out/renderer/assets/{index-DKfAiLyn.js → index-B-wIGFrM.js} +1 -1
- package/out/renderer/assets/{index-DSFW0jId.js → index-BDYZfF3J.js} +2 -2
- package/out/renderer/assets/{index-CNKnTVof.js → index-BRDlnXGV.js} +2 -2
- package/out/renderer/assets/{index-ebosJEhW.js → index-BZaWk11Q.js} +1 -1
- package/out/renderer/assets/{index-BgaEN2Xk.js → index-BbLpDvA3.js} +5 -5
- package/out/renderer/assets/{index-BYK8Oe9C.js → index-BfqM1vG3.js} +1 -1
- package/out/renderer/assets/{index-DSemwSW1.js → index-Bjy__dpB.js} +2 -2
- package/out/renderer/assets/{index-BAx8fHYJ.js → index-Brdnttud.js} +2 -2
- package/out/renderer/assets/{index-BNYmBzYl.js → index-Buw1KWG-.js} +1 -1
- package/out/renderer/assets/{index-D8Zme_wD.js → index-CZCIyO4U.js} +5 -5
- package/out/renderer/assets/{index-ZB0-IQ7z.js → index-CgczHs0-.js} +3 -3
- package/out/renderer/assets/{index-CJzzo9GN.js → index-ChixxdQV.js} +2 -2
- package/out/renderer/assets/{index-BvlgP_C9.js → index-Cwqf0NbI.js} +2 -2
- package/out/renderer/assets/{index-BGkJy1La.js → index-D4xEcHbg.js} +2 -2
- package/out/renderer/assets/{index-Cb4iDr8_.js → index-DD6bNfA0.js} +5 -5
- package/out/renderer/assets/{index-CPxIrW_k.js → index-DDiIQL3b.js} +3 -3
- package/out/renderer/assets/{index-DeBIVVLg.js → index-DMAjk3_P.js} +1 -1
- package/out/renderer/assets/{index-05PndMzj.js → index-DMzzmyZE.js} +696 -453
- package/out/renderer/assets/{index-D3TXtQ08.js → index-DZze20ab.js} +2 -2
- package/out/renderer/assets/{index-B0EFV-gL.js → index-Dgmvrciv.js} +3 -3
- package/out/renderer/assets/{index-CmpSne4j.js → index-Dz4P0Q9P.js} +2 -2
- package/out/renderer/assets/{index-BLbSc28m.js → index-MDUSPmtz.js} +5 -5
- package/out/renderer/assets/{index-D7uIEHLm.js → index-OJ1PmhTm.js} +2 -2
- package/out/renderer/assets/{index-BsVCwy_5.js → index-UQ28Qgl7.js} +5 -5
- package/out/renderer/assets/{index-CmlXgnPK.js → index-ebiHDnXl.js} +2 -2
- package/out/renderer/assets/{index-BR-RxTVt.js → index-mytNi5ms.js} +1 -1
- package/out/renderer/assets/{index-DFijfgHK.js → index-qfaXmy0Y.js} +1 -1
- package/out/renderer/assets/{index-BGegEms-.js → index-tUvIVnIS.js} +1 -1
- package/out/renderer/assets/{index-DA3SfNyd.js → index-u_V0DpfA.js} +5 -5
- package/out/renderer/assets/{index-B9qhGo1c.js → index-vAx0mdd8.js} +4 -4
- package/out/renderer/assets/{infoDiagram-6WML65LV-C-C_195p.js → infoDiagram-6WML65LV-DM7_nqt3.js} +2 -2
- package/out/renderer/assets/{ishikawaDiagram-WSZJBQD7-DdULOU9y.js → ishikawaDiagram-WSZJBQD7-DrWSKswv.js} +1 -1
- package/out/renderer/assets/{journeyDiagram-NVQOT4AX-uqf_qJgk.js → journeyDiagram-NVQOT4AX-Csn7KuKV.js} +4 -4
- package/out/renderer/assets/{jsx-dev-runtime-BpVxbL7b.js → jsx-dev-runtime-CTchQKOk.js} +1 -1
- package/out/renderer/assets/{kanban-definition-27J2QSJJ-Dky8Fg_n.js → kanban-definition-27J2QSJJ-BRXIW-y6.js} +2 -2
- package/out/renderer/assets/{layout-CmE2gzKL.js → layout-CjgVHH-8.js} +3 -3
- package/out/renderer/assets/{linear-KjDRVqMG.js → linear-7N8jztD_.js} +1 -1
- package/out/renderer/assets/{map-DYyl5K0n.js → map-fXOUEC9w.js} +2 -2
- package/out/renderer/assets/{mindmap-definition-FAOFIHXS-8dWcuWHV.js → mindmap-definition-FAOFIHXS-eH5ANg_6.js} +3 -3
- package/out/renderer/assets/{pegDiagram-VL7TDLO6-76hvriT-.js → pegDiagram-VL7TDLO6-_S1HcQ4v.js} +4 -4
- package/out/renderer/assets/{pieDiagram-7S7Q4E2Y-CJ41-CdM.js → pieDiagram-7S7Q4E2Y-BbkejzGW.js} +4 -4
- package/out/renderer/assets/{quadrantDiagram-CIZ2JOQS-BahlXgAq.js → quadrantDiagram-CIZ2JOQS-C9-OKkJL.js} +2 -2
- package/out/renderer/assets/{railroadDiagram-AXF67PYL-PiU_czi3.js → railroadDiagram-AXF67PYL-9VliFuUM.js} +4 -4
- package/out/renderer/assets/{requirementDiagram-LRYGKXZP-C87pqMna.js → requirementDiagram-LRYGKXZP-Dr0S14Mj.js} +3 -3
- package/out/renderer/assets/{sankeyDiagram-W5VNT64P-CdkZmeU5.js → sankeyDiagram-W5VNT64P--k6pZLfZ.js} +1 -1
- package/out/renderer/assets/{sequenceDiagram-SI44F4Z6-CMXFNERX.js → sequenceDiagram-SI44F4Z6-Bx4rTgvS.js} +3 -3
- package/out/renderer/assets/{sizeCapture-X5ZJPWSS-BwMqCMc8.js → sizeCapture-X5ZJPWSS-BkRX3y1x.js} +1 -1
- package/out/renderer/assets/{stateDiagram-OKZ733FA-DiSC7IgF.js → stateDiagram-OKZ733FA-VF2TYKH_.js} +8 -8
- package/out/renderer/assets/{stateDiagram-v2-UEYNNEHI-BQw7DwIi.js → stateDiagram-v2-UEYNNEHI-BodH9nuP.js} +5 -5
- package/out/renderer/assets/{swimlanes-SLNWSIFB-Bhy-gBe5.js → swimlanes-SLNWSIFB-TnShw-0l.js} +6 -6
- package/out/renderer/assets/{swimlanesDiagram-ULZ7WXOC-DOMzSJ4k.js → swimlanesDiagram-ULZ7WXOC-CemoGOe8.js} +7 -7
- package/out/renderer/assets/{time-CTAUr2Xp.js → time-CTB9_khZ.js} +1 -1
- package/out/renderer/assets/{timeline-definition-Z64GVDOM-vx5MLWSt.js → timeline-definition-Z64GVDOM-PQXf9HIJ.js} +2 -2
- package/out/renderer/assets/{vennDiagram-T6HMQDX7-WFytj3Mr.js → vennDiagram-T6HMQDX7-Db5aCF6z.js} +1 -1
- package/out/renderer/assets/{wardleyDiagram-T6FBY63Y-DyYJ0Jvz.js → wardleyDiagram-T6FBY63Y-DI3Rr8Jy.js} +3 -3
- package/out/renderer/assets/{xychartDiagram-ELKLHX3M-Ddq7vrtC.js → xychartDiagram-ELKLHX3M-CYptZ7pE.js} +2 -2
- package/out/renderer/index.html +1 -1
- package/out/resources/connector/connector.py +49 -0
- package/out/runner.js +280 -51
- package/package.json +6 -1
- package/scripts/generate-package.mjs +3 -1
package/out/runner.js
CHANGED
|
@@ -3576,6 +3576,39 @@ const stringifyWithBudget = (value, maxChars = TOOL_RESULT_MAX_JSON_CHARS) => {
|
|
|
3576
3576
|
const safeJsonStringify = (value, maxChars = TOOL_RESULT_MAX_JSON_CHARS) => {
|
|
3577
3577
|
return stringifyWithBudget(value, maxChars).text;
|
|
3578
3578
|
};
|
|
3579
|
+
const TEXT_PART_TYPES = /* @__PURE__ */ new Set(["text", "error-text"]);
|
|
3580
|
+
const contentArrayHasNonTextParts = (content) => {
|
|
3581
|
+
if (!Array.isArray(content)) {
|
|
3582
|
+
return false;
|
|
3583
|
+
}
|
|
3584
|
+
return content.some((part) => part && typeof part === "object" && "type" in part && !TEXT_PART_TYPES.has(part.type));
|
|
3585
|
+
};
|
|
3586
|
+
const hasNonTextContentParts$1 = (value) => {
|
|
3587
|
+
if (value === null || typeof value !== "object") {
|
|
3588
|
+
return false;
|
|
3589
|
+
}
|
|
3590
|
+
if (Array.isArray(value)) {
|
|
3591
|
+
return contentArrayHasNonTextParts(value);
|
|
3592
|
+
}
|
|
3593
|
+
const obj = value;
|
|
3594
|
+
if ("content" in obj && contentArrayHasNonTextParts(obj.content)) {
|
|
3595
|
+
return true;
|
|
3596
|
+
}
|
|
3597
|
+
if ("value" in obj && contentArrayHasNonTextParts(obj.value)) {
|
|
3598
|
+
return true;
|
|
3599
|
+
}
|
|
3600
|
+
return false;
|
|
3601
|
+
};
|
|
3602
|
+
const safeStringifyToolOutput = (value, maxChars = TOOL_RESULT_MAX_JSON_CHARS) => {
|
|
3603
|
+
if (hasNonTextContentParts$1(value)) {
|
|
3604
|
+
try {
|
|
3605
|
+
return JSON.stringify(value);
|
|
3606
|
+
} catch {
|
|
3607
|
+
return JSON.stringify({ truncated: true, note: "Value could not be serialized to JSON." });
|
|
3608
|
+
}
|
|
3609
|
+
}
|
|
3610
|
+
return stringifyWithBudget(value, maxChars).text;
|
|
3611
|
+
};
|
|
3579
3612
|
const LARGE_FILE_READ_THRESHOLD_BYTES = 10 * 1024 * 1024;
|
|
3580
3613
|
const LARGE_FILE_BINARY_SNIFF_BYTES = 8192;
|
|
3581
3614
|
const readFileContent = async (absolutePath, withLines = false, lineOffset = 0, lineLimit = 1e3, sizeLimit = Math.max(50, 0.05 * lineLimit)) => {
|
|
@@ -3793,8 +3826,7 @@ const isNetworkError = (error) => {
|
|
|
3793
3826
|
const convertMcpResultToModelOutput = (output) => {
|
|
3794
3827
|
if (output && typeof output === "object" && "content" in output && Array.isArray(output.content)) {
|
|
3795
3828
|
const content = output.content;
|
|
3796
|
-
|
|
3797
|
-
if (hasNonTextParts) {
|
|
3829
|
+
if (contentArrayHasNonTextParts(content)) {
|
|
3798
3830
|
const value = [];
|
|
3799
3831
|
for (const part of content) {
|
|
3800
3832
|
if (!part || typeof part !== "object") {
|
|
@@ -7036,6 +7068,32 @@ const convertImageToolResults = (messages2) => {
|
|
|
7036
7068
|
const imageParts = [];
|
|
7037
7069
|
for (const toolResultPart of toolContent) {
|
|
7038
7070
|
try {
|
|
7071
|
+
if (toolResultPart.output.type === "content") {
|
|
7072
|
+
if (Array.isArray(toolResultPart.output.value) && toolResultPart.output.value.some((p) => p.type === "file")) {
|
|
7073
|
+
const fileParts = toolResultPart.output.value.filter((p) => p.type === "file");
|
|
7074
|
+
const textParts = toolResultPart.output.value.filter((p) => p.type === "text");
|
|
7075
|
+
logger.debug(
|
|
7076
|
+
`[convertImageToolResults] Extracting ${fileParts.length} image(s) from content-type tool result "${toolResultPart.toolName}" into user message`
|
|
7077
|
+
);
|
|
7078
|
+
for (const filePart of fileParts) {
|
|
7079
|
+
if (filePart.data.type === "data") {
|
|
7080
|
+
imageParts.push({
|
|
7081
|
+
type: "file",
|
|
7082
|
+
data: filePart.data,
|
|
7083
|
+
mediaType: filePart.mediaType
|
|
7084
|
+
});
|
|
7085
|
+
}
|
|
7086
|
+
}
|
|
7087
|
+
const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
|
|
7088
|
+
updatedToolContent.push({
|
|
7089
|
+
...toolResultPart,
|
|
7090
|
+
output: { type: "text", value: textValue }
|
|
7091
|
+
});
|
|
7092
|
+
} else {
|
|
7093
|
+
updatedToolContent.push(toolResultPart);
|
|
7094
|
+
}
|
|
7095
|
+
continue;
|
|
7096
|
+
}
|
|
7039
7097
|
if (toolResultPart.output.type !== "text" && toolResultPart.output.type !== "json") {
|
|
7040
7098
|
updatedToolContent.push(toolResultPart);
|
|
7041
7099
|
continue;
|
|
@@ -8325,7 +8383,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8325
8383
|
const [serverName, toolName] = extractServerNameToolName(chunk.toolName);
|
|
8326
8384
|
const toolPromptContext = extractPromptContextFromToolResult(chunk.output) ?? promptContext;
|
|
8327
8385
|
streamingMessageIds.add(chunk.toolCallId);
|
|
8328
|
-
task.addToolMessage(chunk.toolCallId, serverName, toolName, chunk.input,
|
|
8386
|
+
task.addToolMessage(chunk.toolCallId, serverName, toolName, chunk.input, safeStringifyToolOutput(chunk.output), void 0, toolPromptContext);
|
|
8329
8387
|
task.addLogMessage("loading", void 0, false, promptContext);
|
|
8330
8388
|
}
|
|
8331
8389
|
}
|
|
@@ -8868,7 +8926,7 @@ ${fileList}${readOnlyNote}`
|
|
|
8868
8926
|
serverName,
|
|
8869
8927
|
toolName,
|
|
8870
8928
|
toolResult.input,
|
|
8871
|
-
|
|
8929
|
+
safeStringifyToolOutput(toolResult.output),
|
|
8872
8930
|
!hasAssistantMessage && isLast ? usageReport : void 0,
|
|
8873
8931
|
toolPromptContext
|
|
8874
8932
|
);
|
|
@@ -9513,6 +9571,7 @@ const showModelSelector$3 = "Change model";
|
|
|
9513
9571
|
const hideModelSelector$3 = "Hide model selector";
|
|
9514
9572
|
const logs$3 = { "title": "System Logs", "level": "Level", "allExtensions": "All extensions", "searchPlaceholder": "Search logs...", "debugTooltip": "Debug logs are visible only when LOG_LEVEL environment variable is set to 'debug'.", "autoScroll": "Auto-scroll", "showing": "Showing", "clear": "Clear logs", "noLogs": "No logs to display", "metadata": "Metadata", "clearConfirm": { "title": "Clear logs", "message": "Are you sure you want to clear all buffered logs? This action cannot be undone.", "confirm": "Clear", "cancel": "Cancel" } };
|
|
9515
9573
|
const readonly$3 = { "noTasks": "No tasks", "unnamedTask": "Unnamed task", "archived": "Archived", "loading": "Loading readonly project…", "selectTask": "Select a task to inspect its trace.", "noProjects": "No projects are configured.", "label": "Readonly", "searchTasks": "Search tasks", "allStates": "All states", "bootstrapError": "Unable to load the browser application.", "projectError": "Unable to load this project.", "projects": "Projects", "openTasks": "Open tasks" };
|
|
9574
|
+
const providerTls$2 = { "title": "TLS settings", "disableCertificateVerification": "Disable certificate verification", "disableCertificateVerificationInfo": "Skip TLS certificate validation for this provider endpoint. Use only for trusted servers with self-signed certificates (e.g. local model servers).", "caCertPath": "CA certificate path", "caCertPathInfo": "Absolute path to a CA certificate file (PEM) used to verify the provider endpoint. Prefer this over disabling verification when using self-signed or private CA certificates.", "caCertPathPlaceholder": "/path/to/ca.pem" };
|
|
9516
9575
|
const en = {
|
|
9517
9576
|
languages: languages$3,
|
|
9518
9577
|
commandPalette: commandPalette$3,
|
|
@@ -9599,7 +9658,8 @@ const en = {
|
|
|
9599
9658
|
showModelSelector: showModelSelector$3,
|
|
9600
9659
|
hideModelSelector: hideModelSelector$3,
|
|
9601
9660
|
logs: logs$3,
|
|
9602
|
-
readonly: readonly$3
|
|
9661
|
+
readonly: readonly$3,
|
|
9662
|
+
providerTls: providerTls$2
|
|
9603
9663
|
};
|
|
9604
9664
|
const languages$2 = { "en": "English", "zh": "中文", "ru": "Русский", "ko": "한국어" };
|
|
9605
9665
|
const commandPalette$2 = { "title": "명령 팔레트", "placeholder": "검색어를 입력하세요...", "noResults": "일치하는 결과가 없습니다", "scrollForMore": "더 많은 결과를 보려면 스크롤하세요", "tabs": { "all": "전체", "file": "파일", "action": "작업", "task": "태스크", "project": "프로젝트" } };
|
|
@@ -9858,6 +9918,7 @@ const showModelSelector$1 = "Сменить модель";
|
|
|
9858
9918
|
const hideModelSelector$1 = "Скрыть выбор модели";
|
|
9859
9919
|
const logs$1 = { "title": "Системные журналы", "level": "Уровень", "allExtensions": "Все расширения", "searchPlaceholder": "Поиск по журналам...", "debugTooltip": "Журналы отладки видны только при установке переменной окружения LOG_LEVEL='debug'.", "autoScroll": "Автопрокрутка", "showing": "Показано", "clear": "Очистить журналы", "noLogs": "Нет журналов для отображения", "metadata": "Метаданные", "clearConfirm": { "title": "Очистить журналы", "message": "Вы уверены, что хотите очистить все буферизованные журналы? Это действие нельзя отменить.", "confirm": "Очистить", "cancel": "Отмена" } };
|
|
9860
9920
|
const readonly$1 = { "noTasks": "Нет задач", "unnamedTask": "Задача без названия", "archived": "В архиве", "loading": "Загрузка проекта…", "selectTask": "Выберите задачу для просмотра истории.", "noProjects": "Проекты не настроены.", "label": "Только чтение", "searchTasks": "Поиск задач", "allStates": "Все состояния", "bootstrapError": "Не удалось загрузить приложение.", "projectError": "Не удалось загрузить проект.", "projects": "Проекты", "openTasks": "Открыть задачи" };
|
|
9921
|
+
const providerTls$1 = { "title": "Настройки TLS", "disableCertificateVerification": "Отключить проверку сертификата", "disableCertificateVerificationInfo": "Пропустить проверку TLS-сертификата для эндпоинта этого провайдера. Используйте только для доверенных серверов с самоподписанными сертификатами (например, локальные серверы моделей).", "caCertPath": "Путь к CA-сертификату", "caCertPathInfo": "Абсолютный путь к файлу CA-сертификата (PEM) для проверки эндпоинта провайдера. Для самоподписанных или приватных CA-сертификатов предпочтительнее, чем отключение проверки.", "caCertPathPlaceholder": "/path/to/ca.pem" };
|
|
9861
9922
|
const ru = {
|
|
9862
9923
|
languages: languages$1,
|
|
9863
9924
|
commandPalette: commandPalette$1,
|
|
@@ -9943,7 +10004,8 @@ const ru = {
|
|
|
9943
10004
|
showModelSelector: showModelSelector$1,
|
|
9944
10005
|
hideModelSelector: hideModelSelector$1,
|
|
9945
10006
|
logs: logs$1,
|
|
9946
|
-
readonly: readonly$1
|
|
10007
|
+
readonly: readonly$1,
|
|
10008
|
+
providerTls: providerTls$1
|
|
9947
10009
|
};
|
|
9948
10010
|
const languages = { "en": "English", "zh": "中文", "ru": "俄语", "ko": "한국어" };
|
|
9949
10011
|
const commandPalette = { "title": "命令面板", "placeholder": "输入以搜索...", "noResults": "没有匹配的结果", "scrollForMore": "滚动以查看更多结果", "tabs": { "all": "全部", "file": "文件", "action": "操作", "task": "任务", "project": "项目" } };
|
|
@@ -10034,6 +10096,7 @@ const showModelSelector = "更换模型";
|
|
|
10034
10096
|
const hideModelSelector = "隐藏模型选择器";
|
|
10035
10097
|
const logs = { "title": "系统日志", "level": "级别", "allExtensions": "所有扩展", "searchPlaceholder": "搜索日志...", "debugTooltip": "仅当 LOG_LEVEL 环境变量设置为 'debug' 时,调试日志才可见。", "autoScroll": "自动滚动", "showing": "显示", "clear": "清除日志", "noLogs": "没有日志可显示", "metadata": "元数据", "clearConfirm": { "title": "清除日志", "message": "您确定要清除所有缓冲的日志吗?此操作无法撤销。", "confirm": "清除", "cancel": "取消" } };
|
|
10036
10098
|
const readonly = { "noTasks": "没有任务", "unnamedTask": "未命名任务", "archived": "已归档", "loading": "正在加载只读项目…", "selectTask": "选择任务以查看其完整记录。", "noProjects": "未配置项目。", "label": "只读", "searchTasks": "搜索任务", "allStates": "所有状态", "bootstrapError": "无法加载浏览器应用程序。", "projectError": "无法加载此项目。", "projects": "项目", "openTasks": "打开任务" };
|
|
10099
|
+
const providerTls = { "title": "TLS 设置", "disableCertificateVerification": "禁用证书验证", "disableCertificateVerificationInfo": "跳过此提供商端点的 TLS 证书验证。仅用于使用自签名证书的可信服务器(例如本地模型服务器)。", "caCertPath": "CA 证书路径", "caCertPathInfo": "用于验证提供商端点的 CA 证书文件(PEM)的绝对路径。使用自签名或私有 CA 证书时,建议使用此项而非禁用验证。", "caCertPathPlaceholder": "/path/to/ca.pem" };
|
|
10037
10100
|
const zh = {
|
|
10038
10101
|
languages,
|
|
10039
10102
|
commandPalette,
|
|
@@ -10123,7 +10186,8 @@ const zh = {
|
|
|
10123
10186
|
showModelSelector,
|
|
10124
10187
|
hideModelSelector,
|
|
10125
10188
|
logs,
|
|
10126
|
-
readonly
|
|
10189
|
+
readonly,
|
|
10190
|
+
providerTls
|
|
10127
10191
|
};
|
|
10128
10192
|
const resources = { en, zh, ru, ko };
|
|
10129
10193
|
const getNested = (obj, key) => {
|
|
@@ -17012,6 +17076,25 @@ const PROXY_ENV_VAR_NAMES = ["HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "http_pro
|
|
|
17012
17076
|
const HEADERS_TIMEOUT_MS = 30 * 60 * 1e3;
|
|
17013
17077
|
const BODY_TIMEOUT_MS = 30 * 60 * 1e3;
|
|
17014
17078
|
const CONNECT_TIMEOUT_MS = 30 * 1e3;
|
|
17079
|
+
class TlsRoutingDispatcher extends undici.Dispatcher {
|
|
17080
|
+
constructor(resolveDispatcher, getAllDispatchers) {
|
|
17081
|
+
super();
|
|
17082
|
+
this.resolveDispatcher = resolveDispatcher;
|
|
17083
|
+
this.getAllDispatchers = getAllDispatchers;
|
|
17084
|
+
}
|
|
17085
|
+
resolveDispatcher;
|
|
17086
|
+
getAllDispatchers;
|
|
17087
|
+
dispatch(options, handler) {
|
|
17088
|
+
const origin = typeof options.origin === "string" ? options.origin : options.origin instanceof URL ? options.origin.origin : void 0;
|
|
17089
|
+
return this.resolveDispatcher(origin).dispatch(options, handler);
|
|
17090
|
+
}
|
|
17091
|
+
close() {
|
|
17092
|
+
return Promise.all(this.getAllDispatchers().map((dispatcher) => dispatcher.close())).then(() => void 0);
|
|
17093
|
+
}
|
|
17094
|
+
destroy() {
|
|
17095
|
+
return Promise.all(this.getAllDispatchers().map((dispatcher) => dispatcher.destroy())).then(() => void 0);
|
|
17096
|
+
}
|
|
17097
|
+
}
|
|
17015
17098
|
const getProxyEnvVars = (settings2) => {
|
|
17016
17099
|
if (settings2.proxy?.enabled && settings2.proxy?.url) {
|
|
17017
17100
|
const url = settings2.proxy.url;
|
|
@@ -17032,10 +17115,38 @@ const getProxyEnvVars = (settings2) => {
|
|
|
17032
17115
|
}
|
|
17033
17116
|
return Object.fromEntries(PROXY_ENV_VAR_NAMES.map((key) => [key, ""]));
|
|
17034
17117
|
};
|
|
17035
|
-
|
|
17118
|
+
const getTlsEnvVars = (providers2) => {
|
|
17119
|
+
const vars = {};
|
|
17120
|
+
for (const profile of providers2 || []) {
|
|
17121
|
+
const provider = profile.provider;
|
|
17122
|
+
if (!provider) {
|
|
17123
|
+
continue;
|
|
17124
|
+
}
|
|
17125
|
+
if (provider.sslVerify === false) {
|
|
17126
|
+
vars.AIDER_DESK_INSECURE_TLS = "1";
|
|
17127
|
+
} else if (provider.caCertPath && !vars.AIDER_DESK_CA_BUNDLE_PATH) {
|
|
17128
|
+
vars.AIDER_DESK_CA_BUNDLE_PATH = provider.caCertPath;
|
|
17129
|
+
}
|
|
17130
|
+
}
|
|
17131
|
+
return vars;
|
|
17132
|
+
};
|
|
17133
|
+
const getNetworkEnvVars = (settings2, providers2) => ({
|
|
17134
|
+
...getProxyEnvVars(settings2),
|
|
17135
|
+
...getTlsEnvVars(providers2)
|
|
17136
|
+
});
|
|
17137
|
+
class NetworkManager {
|
|
17036
17138
|
currentUrl = null;
|
|
17139
|
+
currentNoProxy;
|
|
17140
|
+
tlsRules = /* @__PURE__ */ new Map();
|
|
17141
|
+
tlsPolicies = /* @__PURE__ */ new Map();
|
|
17142
|
+
policyDispatchers = /* @__PURE__ */ new Map();
|
|
17143
|
+
defaultDispatcher = new undici.Agent();
|
|
17144
|
+
router = new TlsRoutingDispatcher(
|
|
17145
|
+
(origin) => this.resolveDispatcher(origin),
|
|
17146
|
+
() => this.getAllDispatchers()
|
|
17147
|
+
);
|
|
17037
17148
|
/**
|
|
17038
|
-
* Initialize
|
|
17149
|
+
* Initialize network settings from settings. Called once during app startup (first in managers init).
|
|
17039
17150
|
*/
|
|
17040
17151
|
init(settings2) {
|
|
17041
17152
|
globalAgent.bootstrap();
|
|
@@ -17047,56 +17158,132 @@ class ProxyManager {
|
|
|
17047
17158
|
}
|
|
17048
17159
|
/**
|
|
17049
17160
|
* React to settings changes. Called on every saveSettings().
|
|
17050
|
-
* Re-initializes the proxy if the config changed.
|
|
17161
|
+
* Re-initializes the proxy if the proxy config changed.
|
|
17051
17162
|
*/
|
|
17052
17163
|
settingsChanged(oldSettings, newSettings) {
|
|
17053
17164
|
const oldProxy = oldSettings.proxy;
|
|
17054
17165
|
const newProxy = newSettings.proxy;
|
|
17055
17166
|
if (oldProxy?.enabled !== newProxy?.enabled || oldProxy?.url !== newProxy?.url || oldProxy?.noProxy !== newProxy?.noProxy) {
|
|
17056
17167
|
if (newProxy?.enabled && newProxy?.url) {
|
|
17057
|
-
logger.info(`[
|
|
17168
|
+
logger.info(`[NetworkManager] Applying proxy: ${newProxy.url}`);
|
|
17058
17169
|
this.applyProxy(newProxy.url, newProxy.noProxy);
|
|
17059
17170
|
} else if (this.currentUrl !== null) {
|
|
17060
|
-
logger.info("[
|
|
17171
|
+
logger.info("[NetworkManager] Clearing proxy");
|
|
17061
17172
|
this.clearProxy();
|
|
17062
17173
|
}
|
|
17063
17174
|
}
|
|
17064
17175
|
}
|
|
17176
|
+
setTlsPolicy(origin, options) {
|
|
17177
|
+
let connectOptions;
|
|
17178
|
+
let policyKey;
|
|
17179
|
+
if (options.rejectUnauthorized === false) {
|
|
17180
|
+
connectOptions = { rejectUnauthorized: false };
|
|
17181
|
+
policyKey = "insecure";
|
|
17182
|
+
} else if (options.caCertPath) {
|
|
17183
|
+
try {
|
|
17184
|
+
connectOptions = { ca: [fs$1.readFileSync(options.caCertPath).toString()] };
|
|
17185
|
+
policyKey = `ca:${options.caCertPath}`;
|
|
17186
|
+
} catch (error) {
|
|
17187
|
+
logger.error(`[NetworkManager] Failed to load CA certificate from ${options.caCertPath}:`, {
|
|
17188
|
+
error: error instanceof Error ? error.message : String(error)
|
|
17189
|
+
});
|
|
17190
|
+
return;
|
|
17191
|
+
}
|
|
17192
|
+
}
|
|
17193
|
+
if (!connectOptions || !policyKey) {
|
|
17194
|
+
this.clearTlsPolicy(origin);
|
|
17195
|
+
return;
|
|
17196
|
+
}
|
|
17197
|
+
if (!this.tlsPolicies.has(policyKey)) {
|
|
17198
|
+
this.tlsPolicies.set(policyKey, connectOptions);
|
|
17199
|
+
this.policyDispatchers.set(policyKey, this.buildDispatcher(connectOptions));
|
|
17200
|
+
}
|
|
17201
|
+
if (this.tlsRules.get(origin) !== policyKey) {
|
|
17202
|
+
this.tlsRules.set(origin, policyKey);
|
|
17203
|
+
logger.info(`[NetworkManager] TLS policy registered for ${origin} (${policyKey})`);
|
|
17204
|
+
}
|
|
17205
|
+
}
|
|
17206
|
+
hasTlsPolicy(origin) {
|
|
17207
|
+
return this.tlsRules.has(origin);
|
|
17208
|
+
}
|
|
17209
|
+
clearTlsPolicy(origin) {
|
|
17210
|
+
const policyKey = this.tlsRules.get(origin);
|
|
17211
|
+
if (!policyKey) {
|
|
17212
|
+
return;
|
|
17213
|
+
}
|
|
17214
|
+
this.tlsRules.delete(origin);
|
|
17215
|
+
if (![...this.tlsRules.values()].includes(policyKey)) {
|
|
17216
|
+
this.tlsPolicies.delete(policyKey);
|
|
17217
|
+
const dispatcher = this.policyDispatchers.get(policyKey);
|
|
17218
|
+
this.policyDispatchers.delete(policyKey);
|
|
17219
|
+
if (dispatcher) {
|
|
17220
|
+
void dispatcher.close();
|
|
17221
|
+
}
|
|
17222
|
+
}
|
|
17223
|
+
}
|
|
17224
|
+
resolveDispatcher(origin) {
|
|
17225
|
+
if (origin) {
|
|
17226
|
+
const policyKey = this.tlsRules.get(origin);
|
|
17227
|
+
if (policyKey) {
|
|
17228
|
+
return this.policyDispatchers.get(policyKey) ?? this.defaultDispatcher;
|
|
17229
|
+
}
|
|
17230
|
+
}
|
|
17231
|
+
return this.defaultDispatcher;
|
|
17232
|
+
}
|
|
17233
|
+
getAllDispatchers() {
|
|
17234
|
+
return [this.defaultDispatcher, ...this.policyDispatchers.values()];
|
|
17235
|
+
}
|
|
17065
17236
|
applyProxy(url, noProxy) {
|
|
17066
17237
|
try {
|
|
17067
17238
|
global.GLOBAL_AGENT.HTTP_PROXY = url;
|
|
17068
17239
|
global.GLOBAL_AGENT.NO_PROXY = noProxy || void 0;
|
|
17069
|
-
const proxyAgent = new undici.EnvHttpProxyAgent({
|
|
17070
|
-
httpProxy: url,
|
|
17071
|
-
httpsProxy: url,
|
|
17072
|
-
noProxy: noProxy || void 0,
|
|
17073
|
-
headersTimeout: HEADERS_TIMEOUT_MS,
|
|
17074
|
-
bodyTimeout: BODY_TIMEOUT_MS,
|
|
17075
|
-
connectTimeout: CONNECT_TIMEOUT_MS
|
|
17076
|
-
});
|
|
17077
|
-
undici.setGlobalDispatcher(proxyAgent);
|
|
17078
17240
|
this.currentUrl = url;
|
|
17079
|
-
|
|
17241
|
+
this.currentNoProxy = noProxy;
|
|
17242
|
+
this.rebuildDispatchers();
|
|
17243
|
+
logger.info(`[NetworkManager] Proxy initialized: ${url}`);
|
|
17080
17244
|
} catch (error) {
|
|
17081
|
-
logger.error("[
|
|
17245
|
+
logger.error("[NetworkManager] Failed to initialize proxy", { error: error instanceof Error ? error.message : String(error) });
|
|
17082
17246
|
}
|
|
17083
17247
|
}
|
|
17084
17248
|
clearProxy() {
|
|
17085
17249
|
try {
|
|
17086
17250
|
global.GLOBAL_AGENT.HTTP_PROXY = void 0;
|
|
17087
17251
|
global.GLOBAL_AGENT.NO_PROXY = void 0;
|
|
17088
|
-
undici.setGlobalDispatcher(
|
|
17089
|
-
new undici.Agent({
|
|
17090
|
-
headersTimeout: HEADERS_TIMEOUT_MS,
|
|
17091
|
-
bodyTimeout: BODY_TIMEOUT_MS,
|
|
17092
|
-
connectTimeout: CONNECT_TIMEOUT_MS
|
|
17093
|
-
})
|
|
17094
|
-
);
|
|
17095
17252
|
this.currentUrl = null;
|
|
17096
|
-
|
|
17253
|
+
this.currentNoProxy = void 0;
|
|
17254
|
+
this.rebuildDispatchers();
|
|
17255
|
+
logger.info("[NetworkManager] Proxy cleared");
|
|
17097
17256
|
} catch (error) {
|
|
17098
|
-
logger.error("[
|
|
17257
|
+
logger.error("[NetworkManager] Failed to clear proxy", { error: error instanceof Error ? error.message : String(error) });
|
|
17258
|
+
}
|
|
17259
|
+
}
|
|
17260
|
+
rebuildDispatchers() {
|
|
17261
|
+
const oldDispatchers = this.getAllDispatchers();
|
|
17262
|
+
this.defaultDispatcher = this.buildDispatcher();
|
|
17263
|
+
this.policyDispatchers.clear();
|
|
17264
|
+
for (const [policyKey, connectOptions] of this.tlsPolicies) {
|
|
17265
|
+
this.policyDispatchers.set(policyKey, this.buildDispatcher(connectOptions));
|
|
17266
|
+
}
|
|
17267
|
+
undici.setGlobalDispatcher(this.router);
|
|
17268
|
+
oldDispatchers.forEach((dispatcher) => void dispatcher.close());
|
|
17269
|
+
}
|
|
17270
|
+
buildDispatcher(connectOptions) {
|
|
17271
|
+
const baseOptions = {
|
|
17272
|
+
headersTimeout: HEADERS_TIMEOUT_MS,
|
|
17273
|
+
bodyTimeout: BODY_TIMEOUT_MS,
|
|
17274
|
+
connectTimeout: CONNECT_TIMEOUT_MS,
|
|
17275
|
+
// `connect` applies to plain Agents, `requestTls` to origins tunneled through ProxyAgent CONNECT
|
|
17276
|
+
...connectOptions ? { connect: connectOptions, requestTls: connectOptions } : {}
|
|
17277
|
+
};
|
|
17278
|
+
if (this.currentUrl) {
|
|
17279
|
+
return new undici.EnvHttpProxyAgent({
|
|
17280
|
+
httpProxy: this.currentUrl,
|
|
17281
|
+
httpsProxy: this.currentUrl,
|
|
17282
|
+
noProxy: this.currentNoProxy || void 0,
|
|
17283
|
+
...baseOptions
|
|
17284
|
+
});
|
|
17099
17285
|
}
|
|
17286
|
+
return new undici.Agent(baseOptions);
|
|
17100
17287
|
}
|
|
17101
17288
|
}
|
|
17102
17289
|
class AiderManager {
|
|
@@ -17216,13 +17403,13 @@ class AiderManager {
|
|
|
17216
17403
|
taskId: this.task.taskId,
|
|
17217
17404
|
args
|
|
17218
17405
|
});
|
|
17219
|
-
const
|
|
17406
|
+
const networkEnvVars = getNetworkEnvVars(settings2, this.store.getProviders());
|
|
17220
17407
|
const env = {
|
|
17221
17408
|
...process.env,
|
|
17222
17409
|
...environmentVariables,
|
|
17223
17410
|
...envFromMain,
|
|
17224
17411
|
...envFromWeak,
|
|
17225
|
-
...
|
|
17412
|
+
...networkEnvVars,
|
|
17226
17413
|
PYTHONPATH: AIDER_DESK_CONNECTOR_DIR,
|
|
17227
17414
|
PYTHONUTF8: process.env.AIDER_DESK_OMIT_PYTHONUTF8 ? void 0 : "1",
|
|
17228
17415
|
BASE_DIR: this.task.getProjectDir(),
|
|
@@ -22715,7 +22902,7 @@ ${contentText}</agent-response>`;
|
|
|
22715
22902
|
logger.debug("Aider environment variables changed, updating connectors.");
|
|
22716
22903
|
const updatedEnvironmentVariables = {
|
|
22717
22904
|
...getEnvironmentVariablesForAider(newSettings, this.project.baseDir),
|
|
22718
|
-
...
|
|
22905
|
+
...getNetworkEnvVars(newSettings, this.store.getProviders())
|
|
22719
22906
|
};
|
|
22720
22907
|
this.sendUpdateEnvVars(updatedEnvironmentVariables);
|
|
22721
22908
|
}
|
|
@@ -25179,10 +25366,33 @@ const anthropicProviderStrategy = {
|
|
|
25179
25366
|
getCacheControl: getAnthropicCacheControl,
|
|
25180
25367
|
getProviderOptions: getAnthropicProviderOptions
|
|
25181
25368
|
};
|
|
25369
|
+
const syncProviderTlsRule = (registrar, baseUrl, sslVerify, caCertPath) => {
|
|
25370
|
+
if (!registrar) {
|
|
25371
|
+
return;
|
|
25372
|
+
}
|
|
25373
|
+
let origin;
|
|
25374
|
+
try {
|
|
25375
|
+
origin = baseUrl ? new URL(baseUrl).origin : void 0;
|
|
25376
|
+
} catch {
|
|
25377
|
+
origin = void 0;
|
|
25378
|
+
}
|
|
25379
|
+
if (!origin) {
|
|
25380
|
+
return;
|
|
25381
|
+
}
|
|
25382
|
+
const options = {
|
|
25383
|
+
...sslVerify === false ? { rejectUnauthorized: false } : {},
|
|
25384
|
+
...caCertPath ? { caCertPath } : {}
|
|
25385
|
+
};
|
|
25386
|
+
if (options.rejectUnauthorized === false || options.caCertPath) {
|
|
25387
|
+
registrar.setTlsPolicy(origin, options);
|
|
25388
|
+
} else {
|
|
25389
|
+
registrar.clearTlsPolicy(origin);
|
|
25390
|
+
}
|
|
25391
|
+
};
|
|
25182
25392
|
const ensureV1Suffix = (baseUrl) => {
|
|
25183
25393
|
return baseUrl.endsWith("/v1") ? baseUrl : `${baseUrl}/v1`;
|
|
25184
25394
|
};
|
|
25185
|
-
const loadAnthropicCompatibleModels = async (profile, settings2) => {
|
|
25395
|
+
const loadAnthropicCompatibleModels = async (profile, settings2, tlsRegistrar) => {
|
|
25186
25396
|
if (!isAnthropicCompatibleProvider(profile.provider)) {
|
|
25187
25397
|
return { models: [], success: false };
|
|
25188
25398
|
}
|
|
@@ -25196,6 +25406,7 @@ const loadAnthropicCompatibleModels = async (profile, settings2) => {
|
|
|
25196
25406
|
if (!(effectiveApiKey && effectiveBaseUrl)) {
|
|
25197
25407
|
return { models: [], success: false };
|
|
25198
25408
|
}
|
|
25409
|
+
syncProviderTlsRule(tlsRegistrar, effectiveBaseUrl, provider.sslVerify, provider.caCertPath);
|
|
25199
25410
|
try {
|
|
25200
25411
|
const response = await fetch(`${ensureV1Suffix(effectiveBaseUrl)}/models`, {
|
|
25201
25412
|
headers: {
|
|
@@ -25256,7 +25467,7 @@ const getAnthropicCompatibleAiderMapping = (provider, modelId, settings2, projec
|
|
|
25256
25467
|
environmentVariables: envVars
|
|
25257
25468
|
};
|
|
25258
25469
|
};
|
|
25259
|
-
const createAnthropicCompatibleLlm = (profile, model2, settings2, projectDir) => {
|
|
25470
|
+
const createAnthropicCompatibleLlm = (profile, model2, settings2, projectDir, _toolSet, _systemPrompt, _providerMetadata, tlsRegistrar) => {
|
|
25260
25471
|
const provider = profile.provider;
|
|
25261
25472
|
let apiKey = provider.apiKey;
|
|
25262
25473
|
let baseUrl = provider.baseUrl;
|
|
@@ -25280,6 +25491,7 @@ const createAnthropicCompatibleLlm = (profile, model2, settings2, projectDir) =>
|
|
|
25280
25491
|
if (!baseUrl) {
|
|
25281
25492
|
throw new Error(`Base URL is required for ${provider.name} provider. Set it in Providers settings or via the ANTHROPIC_API_BASE environment variable.`);
|
|
25282
25493
|
}
|
|
25494
|
+
syncProviderTlsRule(tlsRegistrar, baseUrl, provider.sslVerify, provider.caCertPath);
|
|
25283
25495
|
const anthropicProvider = anthropic$4.createAnthropic({
|
|
25284
25496
|
apiKey,
|
|
25285
25497
|
baseURL: ensureV1Suffix(baseUrl),
|
|
@@ -27592,7 +27804,7 @@ const openaiProviderStrategy = {
|
|
|
27592
27804
|
// Voice support
|
|
27593
27805
|
createVoiceSession: createOpenAIVoiceSession
|
|
27594
27806
|
};
|
|
27595
|
-
const loadOpenaiCompatibleModels = async (profile, settings2) => {
|
|
27807
|
+
const loadOpenaiCompatibleModels = async (profile, settings2, tlsRegistrar) => {
|
|
27596
27808
|
if (!isOpenAiCompatibleProvider(profile.provider)) {
|
|
27597
27809
|
return { models: [], success: false };
|
|
27598
27810
|
}
|
|
@@ -27606,6 +27818,7 @@ const loadOpenaiCompatibleModels = async (profile, settings2) => {
|
|
|
27606
27818
|
if (!effectiveBaseUrl) {
|
|
27607
27819
|
return { models: [], success: false };
|
|
27608
27820
|
}
|
|
27821
|
+
syncProviderTlsRule(tlsRegistrar, effectiveBaseUrl, provider.sslVerify, provider.caCertPath);
|
|
27609
27822
|
try {
|
|
27610
27823
|
const response = await fetch(
|
|
27611
27824
|
`${effectiveBaseUrl}/models`,
|
|
@@ -27658,7 +27871,7 @@ const getOpenAiCompatibleAiderMapping = (provider, modelId) => {
|
|
|
27658
27871
|
environmentVariables: envVars
|
|
27659
27872
|
};
|
|
27660
27873
|
};
|
|
27661
|
-
const createOpenAiCompatibleLlm = (profile, model2, settings2, projectDir) => {
|
|
27874
|
+
const createOpenAiCompatibleLlm = (profile, model2, settings2, projectDir, _toolSet, _systemPrompt, _providerMetadata, tlsRegistrar) => {
|
|
27662
27875
|
const provider = profile.provider;
|
|
27663
27876
|
let apiKey = provider.apiKey;
|
|
27664
27877
|
let baseUrl = provider.baseUrl;
|
|
@@ -27679,6 +27892,7 @@ const createOpenAiCompatibleLlm = (profile, model2, settings2, projectDir) => {
|
|
|
27679
27892
|
if (!baseUrl) {
|
|
27680
27893
|
throw new Error(`Base URL is required for ${provider.name} provider. Set it in Providers settings or via the OPENAI_API_BASE environment variable.`);
|
|
27681
27894
|
}
|
|
27895
|
+
syncProviderTlsRule(tlsRegistrar, baseUrl, provider.sslVerify, provider.caCertPath);
|
|
27682
27896
|
const providerOverrides = model2.providerOverrides;
|
|
27683
27897
|
const trackTokenUsage = providerOverrides?.trackTokenUsage ?? provider.trackTokenUsage;
|
|
27684
27898
|
const compatibleProvider = openaiCompatible.createOpenAICompatible({
|
|
@@ -28638,13 +28852,15 @@ const MODELS_FILE = path.join(AIDER_DESK_DATA_DIR, "models.json");
|
|
|
28638
28852
|
const PROVIDER_MODELS_CACHE_FILE = path.join(AIDER_DESK_CACHE_DIR, "provider-models.json");
|
|
28639
28853
|
const PROVIDER_MODELS_CACHE_VERSION = 2;
|
|
28640
28854
|
class ModelManager {
|
|
28641
|
-
constructor(store, eventManager) {
|
|
28855
|
+
constructor(store, eventManager, tlsRegistrar) {
|
|
28642
28856
|
this.store = store;
|
|
28643
28857
|
this.eventManager = eventManager;
|
|
28858
|
+
this.tlsRegistrar = tlsRegistrar;
|
|
28644
28859
|
this.initPromise = this.init();
|
|
28645
28860
|
}
|
|
28646
28861
|
store;
|
|
28647
28862
|
eventManager;
|
|
28863
|
+
tlsRegistrar;
|
|
28648
28864
|
modelsInfo = {};
|
|
28649
28865
|
initPromise;
|
|
28650
28866
|
providerModels = {};
|
|
@@ -28837,7 +29053,7 @@ class ModelManager {
|
|
|
28837
29053
|
logger.info(`Retrying load models for provider profile ${profile.id} in ${delayMs}ms (attempt ${attempt + 1}/${retryCount + 1})`);
|
|
28838
29054
|
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
|
28839
29055
|
}
|
|
28840
|
-
lastResponse = await strategy.loadModels(profile, this.store.getSettings());
|
|
29056
|
+
lastResponse = await strategy.loadModels(profile, this.store.getSettings(), this.tlsRegistrar);
|
|
28841
29057
|
if (lastResponse.success) {
|
|
28842
29058
|
return lastResponse;
|
|
28843
29059
|
}
|
|
@@ -29181,7 +29397,7 @@ class ModelManager {
|
|
|
29181
29397
|
if (!modelObj) {
|
|
29182
29398
|
throw new Error(`Model not found: ${model2}`);
|
|
29183
29399
|
}
|
|
29184
|
-
return strategy.createLlm(provider, modelObj, settings2, projectDir, toolSet, systemPrompt, providerMetadata);
|
|
29400
|
+
return strategy.createLlm(provider, modelObj, settings2, projectDir, toolSet, systemPrompt, providerMetadata, this.tlsRegistrar);
|
|
29185
29401
|
}
|
|
29186
29402
|
getUsageReport(task, provider, model2, usage, providerMetadata) {
|
|
29187
29403
|
const strategy = this.providerRegistry[provider.provider.name];
|
|
@@ -29352,7 +29568,7 @@ class ModelManager {
|
|
|
29352
29568
|
const { provider } = registered;
|
|
29353
29569
|
this.providerRegistry[provider.provider.name] = {
|
|
29354
29570
|
...provider.strategy,
|
|
29355
|
-
createLlm: (profile2, model2, settings2, projectDir, toolSet, systemPrompt, providerMetadata) => provider.strategy.createLlm(profile2, model2, settings2, projectDir, toolSet, systemPrompt, providerMetadata),
|
|
29571
|
+
createLlm: (profile2, model2, settings2, projectDir, toolSet, systemPrompt, providerMetadata, tlsRegistrar) => provider.strategy.createLlm(profile2, model2, settings2, projectDir, toolSet, systemPrompt, providerMetadata, tlsRegistrar),
|
|
29356
29572
|
getUsageReport: provider.strategy.getUsageReport || getDefaultUsageReport,
|
|
29357
29573
|
getProviderOptions: provider.strategy.getProviderOptions ? (_provider, model2, reasoning) => provider.strategy.getProviderOptions(model2, reasoning) : void 0,
|
|
29358
29574
|
getProviderTools: provider.strategy.getProviderTools ? (_provider, model2) => provider.strategy.getProviderTools(model2) : void 0,
|
|
@@ -31505,11 +31721,24 @@ class ExtensionLibraryLoader {
|
|
|
31505
31721
|
}
|
|
31506
31722
|
}
|
|
31507
31723
|
const EXTENSION_TOOL_RESULT_MAX_CHARS = 2e5;
|
|
31724
|
+
const hasNonTextContentParts = (value) => {
|
|
31725
|
+
if (value === null || typeof value !== "object") {
|
|
31726
|
+
return false;
|
|
31727
|
+
}
|
|
31728
|
+
if (Array.isArray(value)) {
|
|
31729
|
+
return contentArrayHasNonTextParts(value);
|
|
31730
|
+
}
|
|
31731
|
+
const obj = value;
|
|
31732
|
+
return "content" in obj && contentArrayHasNonTextParts(obj.content) || "value" in obj && contentArrayHasNonTextParts(obj.value);
|
|
31733
|
+
};
|
|
31508
31734
|
const boundExtensionToolResult = async (result) => {
|
|
31509
31735
|
if (typeof result === "string" && result.length > EXTENSION_TOOL_RESULT_MAX_CHARS) {
|
|
31510
31736
|
return await truncateToolResult(result, 1e3, 200, 2e4);
|
|
31511
31737
|
}
|
|
31512
31738
|
if (result !== null && typeof result === "object") {
|
|
31739
|
+
if (hasNonTextContentParts(result)) {
|
|
31740
|
+
return result;
|
|
31741
|
+
}
|
|
31513
31742
|
const { text, truncated } = stringifyWithBudget(result, EXTENSION_TOOL_RESULT_MAX_CHARS);
|
|
31514
31743
|
if (truncated) {
|
|
31515
31744
|
return JSON.parse(text);
|
|
@@ -33156,7 +33385,7 @@ class ExtensionManager {
|
|
|
33156
33385
|
}
|
|
33157
33386
|
}
|
|
33158
33387
|
class EventsHandler {
|
|
33159
|
-
constructor(projectManager, store, mcpManager, mcpConfigManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager,
|
|
33388
|
+
constructor(projectManager, store, mcpManager, mcpConfigManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, networkManager, promptsManager, windowManager) {
|
|
33160
33389
|
this.projectManager = projectManager;
|
|
33161
33390
|
this.store = store;
|
|
33162
33391
|
this.mcpManager = mcpManager;
|
|
@@ -33171,7 +33400,7 @@ class EventsHandler {
|
|
|
33171
33400
|
this.agentProfileManager = agentProfileManager;
|
|
33172
33401
|
this.memoryManager = memoryManager;
|
|
33173
33402
|
this.extensionManager = extensionManager;
|
|
33174
|
-
this.
|
|
33403
|
+
this.networkManager = networkManager;
|
|
33175
33404
|
this.promptsManager = promptsManager;
|
|
33176
33405
|
this.windowManager = windowManager;
|
|
33177
33406
|
}
|
|
@@ -33189,7 +33418,7 @@ class EventsHandler {
|
|
|
33189
33418
|
agentProfileManager;
|
|
33190
33419
|
memoryManager;
|
|
33191
33420
|
extensionManager;
|
|
33192
|
-
|
|
33421
|
+
networkManager;
|
|
33193
33422
|
promptsManager;
|
|
33194
33423
|
windowManager;
|
|
33195
33424
|
loadSettings() {
|
|
@@ -33201,7 +33430,7 @@ class EventsHandler {
|
|
|
33201
33430
|
async saveSettings(newSettings) {
|
|
33202
33431
|
const oldSettings = this.store.getSettings();
|
|
33203
33432
|
this.store.saveSettings(newSettings);
|
|
33204
|
-
this.
|
|
33433
|
+
this.networkManager.settingsChanged(oldSettings, newSettings);
|
|
33205
33434
|
void this.projectManager.settingsChanged(oldSettings, newSettings);
|
|
33206
33435
|
this.telemetryManager.settingsChanged(oldSettings, newSettings);
|
|
33207
33436
|
void this.memoryManager.settingsChanged(oldSettings, newSettings);
|
|
@@ -34991,8 +35220,8 @@ class PythonDependenciesInstaller {
|
|
|
34991
35220
|
}
|
|
34992
35221
|
}
|
|
34993
35222
|
const initManagers = async (store, windowManager) => {
|
|
34994
|
-
const
|
|
34995
|
-
|
|
35223
|
+
const networkManager = new NetworkManager();
|
|
35224
|
+
networkManager.init(store.getSettings());
|
|
34996
35225
|
const telemetryManager = new TelemetryManager(store);
|
|
34997
35226
|
telemetryManager.init().catch((error) => {
|
|
34998
35227
|
logger.error("[Telemetry] Telemetry initialization failed, continuing without analytics:", error);
|
|
@@ -35008,7 +35237,7 @@ const initManagers = async (store, windowManager) => {
|
|
|
35008
35237
|
});
|
|
35009
35238
|
initEventLogging(eventManager);
|
|
35010
35239
|
const pythonInstaller = new PythonDependenciesInstaller(eventManager);
|
|
35011
|
-
const modelManager = new ModelManager(store, eventManager);
|
|
35240
|
+
const modelManager = new ModelManager(store, eventManager, networkManager);
|
|
35012
35241
|
const dataManager = new DataManager();
|
|
35013
35242
|
dataManager.init();
|
|
35014
35243
|
const memoryManager = new MemoryManager(store);
|
|
@@ -35062,7 +35291,7 @@ const initManagers = async (store, windowManager) => {
|
|
|
35062
35291
|
agentProfileManager,
|
|
35063
35292
|
memoryManager,
|
|
35064
35293
|
extensionManager,
|
|
35065
|
-
|
|
35294
|
+
networkManager,
|
|
35066
35295
|
promptsManager,
|
|
35067
35296
|
windowManager
|
|
35068
35297
|
);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aiderdesk/aiderdesk",
|
|
3
|
-
"version": "0.79.
|
|
3
|
+
"version": "0.79.1",
|
|
4
4
|
"description": "AiderDesk - AI-Powered Development Platform",
|
|
5
5
|
"bin": {
|
|
6
6
|
"aiderdesk": "./bin/aiderdesk.js"
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"@ai-sdk/mistral": "4.0.28",
|
|
51
51
|
"@ai-sdk/openai": "4.0.38",
|
|
52
52
|
"@ai-sdk/openai-compatible": "3.0.29",
|
|
53
|
+
"@ai-sdk/otel": "1.0.60",
|
|
53
54
|
"@aiderdesk/extensions": "0.30.0",
|
|
54
55
|
"@aws-sdk/client-bedrock": "^3.1059.0",
|
|
55
56
|
"@aws-sdk/credential-providers": "^3.1059.0",
|
|
@@ -62,6 +63,10 @@
|
|
|
62
63
|
"@lancedb/lancedb": "^0.22.3",
|
|
63
64
|
"@modelcontextprotocol/sdk": "^1.20.0",
|
|
64
65
|
"@openrouter/ai-sdk-provider": "3.0.0",
|
|
66
|
+
"@opentelemetry/auto-instrumentations-node": "^0.79.0",
|
|
67
|
+
"@opentelemetry/exporter-trace-otlp-http": "^0.219.0",
|
|
68
|
+
"@opentelemetry/sdk-node": "^0.221.0",
|
|
69
|
+
"@opentelemetry/sdk-trace-base": "^2.10.0",
|
|
65
70
|
"@posthog/ai": "^8.3.0",
|
|
66
71
|
"@requesty/ai-sdk": "3.5.0",
|
|
67
72
|
"adm-zip": "^0.6.0",
|
|
@@ -96,7 +96,9 @@ pkgJson.dependencies = Object.keys(pkgJson.dependencies).sort().reduce((acc, key
|
|
|
96
96
|
return acc;
|
|
97
97
|
}, {});
|
|
98
98
|
|
|
99
|
-
|
|
99
|
+
if (!process.env.SKIP_VERSION_SYNC) {
|
|
100
|
+
pkgJson.version = rootPkg.version;
|
|
101
|
+
}
|
|
100
102
|
|
|
101
103
|
if (rootPkg.overrides) {
|
|
102
104
|
pkgJson.overrides = rootPkg.overrides;
|