@aiderdesk/aiderdesk 0.61.0 → 0.62.0

package/out/runner.js

@@ -31,12 +31,8 @@ const node_sqlite = require("node:sqlite");
 const path = require("path");
 const os = require("os");
 const http = require("http");
-const undici = require("undici");
-const uuid = require("uuid");
-const ai = require("ai");
 const gpt4o = require("gpt-tokenizer/model/gpt-4o");
 const istextorbinary = require("istextorbinary");
-const fileType = require("file-type");
 const child_process = require("child_process");
 const treeKill = require("tree-kill");
 const glob = require("glob");
@@ -52,6 +48,7 @@ const slugify = require("slugify");
 const Turndown = require("turndown");
 const cheerio = require("cheerio");
 const yamlFrontMatter = require("yaml-front-matter");
+const uuid = require("uuid");
 const index_js = require("@modelcontextprotocol/sdk/client/index.js");
 const stdio_js = require("@modelcontextprotocol/sdk/client/stdio.js");
 const streamableHttp_js = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
@@ -64,6 +61,10 @@ const cloudflared = require("cloudflared");
 const socket_io = require("socket.io");
 const debounce = require("lodash/debounce.js");
 const crypto = require("crypto");
+const undici = require("undici");
+const globalAgent = require("global-agent");
+const ai = require("ai");
+const fileType = require("file-type");
 const anthropic = require("@ai-sdk/anthropic");
 const azure = require("@ai-sdk/azure");
 const clientBedrock = require("@aws-sdk/client-bedrock");
@@ -78,6 +79,7 @@ const genai = require("@google/genai");
 const openaiCompatible = require("@ai-sdk/openai-compatible");
 const groq = require("@ai-sdk/groq");
 const alibaba = require("@ai-sdk/alibaba");
+const mistral = require("@ai-sdk/mistral");
 const ollamaAiProviderV2 = require("ollama-ai-provider-v2");
 const openai = require("@ai-sdk/openai");
 const aiSdkProvider = require("@openrouter/ai-sdk-provider");
@@ -1462,6 +1464,7 @@ const AVAILABLE_PROVIDERS = [
   "litellm",
   "lmstudio",
   "minimax",
+  "mistral",
   "ollama",
   "openai",
   "openai-compatible",
@@ -1506,24 +1509,28 @@ const isRequestyProvider = (provider) => provider.name === "requesty";
 const isOpenCodeProvider = (provider) => provider.name === "opencode";
 const isZaiPlanProvider = (provider) => provider.name === "zai-plan";
 const isMinimaxProvider = (provider) => provider.name === "minimax";
+const isMistralProvider = (provider) => provider.name === "mistral";
 const isSyntheticProvider = (provider) => provider.name === "synthetic";
-const DEFAULT_MODEL_TEMPERATURE = 0;
 const DEFAULT_PROVIDER_MODELS = {
   "alibaba-plan": "qwen3-coder-plus",
   anthropic: "claude-sonnet-4-6",
+  auggie: "gpt-5-4",
+  bedrock: "global.anthropic.claude-sonnet-4-6",
   cerebras: "qwen-3-235b-a22b-instruct-2507",
   "claude-agent-sdk": "sonnet",
   deepseek: "deepseek-chat",
   gemini: "gemini-pro-latest",
-  "gemini-cli": "gemini-2.5-flash",
+  "gemini-cli": "gemini-2.5-pro",
   groq: "moonshotai/kimi-k2-instruct-0905",
+  "kimi-plan": "k2p5",
   openai: "gpt-5.4",
   openrouter: "anthropic/claude-sonnet-4.6",
   opencode: "claude-sonnet-4-6",
   requesty: "anthropic/claude-sonnet-4-6",
   synthetic: "hf:zai-org/GLM-4.7",
-  "zai-plan": "glm-5",
-  minimax: "MiniMax-M2"
+  "zai-plan": "glm-5.1",
+  minimax: "MiniMax-M2.7",
+  mistral: "mistral-large-latest"
 };
 const DEFAULT_AIDER_MAIN_MODEL = `anthropic/${DEFAULT_PROVIDER_MODELS.anthropic}`;
 const DEFAULT_AGENT_PROFILE_ID = "default";
@@ -1920,6 +1927,12 @@ const getDefaultProviderParams = (providerName) => {
         apiKey: ""
       };
       break;
+    case "mistral":
+      provider = {
+        name: "mistral",
+        apiKey: ""
+      };
+      break;
     case "gemini-cli":
       provider = {
         name: "gemini-cli",
@@ -2181,7 +2194,8 @@ const readApiKeyFromConfFile = (filePath, envVarName) => {
           CEREBRAS_API_KEY: ["cerebras"],
           OPENCODE_API_KEY: ["opencode"],
           REQUESTY_API_KEY: ["requesty"],
-          SYNTHETIC_API_KEY: ["synthetic"]
+          SYNTHETIC_API_KEY: ["synthetic"],
+          MISTRAL_API_KEY: ["mistral"]
         };
         const providerNames = envVarToProviderName[envVarName] || [envVarName.replace(/_API_KEY$/, "").toLowerCase()];
         const apiKeys = Array.isArray(apiKeyValue) ? apiKeyValue : [apiKeyValue];
@@ -5905,16 +5919,6 @@ const removeDuplicateToolCalls = (messages) => {
   }
   return newMessages;
 };
-undici.setGlobalDispatcher(
-  new undici.Agent({
-    headersTimeout: 30 * 60 * 1e3,
-    // 30 minutes
-    bodyTimeout: 30 * 60 * 1e3,
-    // 30 minutes
-    connectTimeout: 30 * 1e3
-    // 30 seconds
-  })
-);
 const MAX_RETRIES = 3;
 class Agent {
   constructor(store, agentProfileManager, mcpManager, modelManager, telemetryManager, memoryManager, promptsManager, extensionManager) {
@@ -6727,6 +6731,9 @@ ${fileList}`
           responseMessageIndex = 0;
           hasReasoning = false;
           streamingMessageIds.clear();
+          if (responseMessages.length > 0) {
+            retryCount = 0;
+          }
         };
         const extensionStepStartedResult = await this.extensionManager.dispatchEvent(
           "onAgentStepStarted",
@@ -8571,12 +8578,15 @@ const HandoffConversationSchema = zod.z.object({
   taskId: zod.z.string().min(1, "Task id is required"),
   focus: zod.z.string().optional()
 });
-const RunCodeInlineRequestSchema = zod.z.object({
-  projectDir: zod.z.string().min(1, "Project directory is required"),
-  taskId: zod.z.string().min(1, "Task id is required"),
+const ChangeRequestItemSchema = zod.z.object({
   filename: zod.z.string().min(1, "Filename is required"),
   lineNumber: zod.z.number().int().min(1, "Line number is required"),
-  userComment: zod.z.string().min(1, "User comment is required"),
+  userComment: zod.z.string().min(1, "User comment is required")
+});
+const RunCodeChangeRequestsSchema = zod.z.object({
+  projectDir: zod.z.string().min(1, "Project directory is required"),
+  taskId: zod.z.string().min(1, "Task id is required"),
+  requests: zod.z.array(ChangeRequestItemSchema).min(1, "At least one request is required"),
   createNewTask: zod.z.boolean().optional()
 });
 const ScrapeWebSchema = zod.z.object({
@@ -8608,6 +8618,7 @@ const RestoreFileSchema = zod.z.object({
 });
 const ReadFileSchema = zod.z.object({
   projectDir: zod.z.string().min(1, "Project directory is required"),
+  taskId: zod.z.string().min(1, "Task id is required"),
   filePath: zod.z.string().min(1, "File path is required")
 });
 const GenerateCommitMessageSchema = zod.z.object({
@@ -8976,15 +8987,15 @@ class ProjectApi extends BaseApi {
       })
     );
     router.post(
-      "/project/run-code-inline-request",
+      "/project/run-code-change-requests",
       this.handleRequest(async (req, res) => {
-        const parsed = this.validateRequest(RunCodeInlineRequestSchema, req.body, res);
+        const parsed = this.validateRequest(RunCodeChangeRequestsSchema, req.body, res);
         if (!parsed) {
           return;
         }
-        const { projectDir, taskId, filename, lineNumber, userComment, createNewTask } = parsed;
-        await this.eventsHandler.runCodeInlineRequest(projectDir, taskId, filename, lineNumber, userComment, createNewTask);
-        res.status(200).json({ message: "Code inline request initiated" });
+        const { projectDir, taskId, requests, createNewTask } = parsed;
+        await this.eventsHandler.runCodeChangeRequests(projectDir, taskId, requests, createNewTask);
+        res.status(200).json({ message: "Code change requests initiated" });
       })
     );
     router.post(
@@ -9054,8 +9065,8 @@ class ProjectApi extends BaseApi {
         if (!parsed) {
           return;
         }
-        const { projectDir, filePath } = parsed;
-        const content = await this.eventsHandler.readFile(projectDir, filePath);
+        const { projectDir, taskId, filePath } = parsed;
+        const content = await this.eventsHandler.readFile(projectDir, taskId, filePath);
         res.status(200).json({ content });
       })
     );
@@ -9488,9 +9499,10 @@ const GetSystemLogsSchema = zod.z.object({
   levels: zod.z.array(zod.z.string()).optional()
 });
 class SystemApi extends BaseApi {
-  constructor(eventsHandler) {
+  constructor(eventsHandler, pythonInstaller) {
     super();
     this.eventsHandler = eventsHandler;
+    this.pythonInstaller = pythonInstaller;
   }
   registerRoutes(router) {
     router.get(
@@ -9524,6 +9536,13 @@ class SystemApi extends BaseApi {
         res.status(200).json({ success: true });
       })
     );
+    router.get(
+      "/system/aider-connector-status",
+      this.handleRequest(async (_req, res) => {
+        const status = this.pythonInstaller.getStatus();
+        res.status(200).json(status);
+      })
+    );
   }
 }
 const GetTodosSchema = zod.z.object({
@@ -10102,11 +10121,12 @@ class ExtensionsApi extends BaseApi {
 }
 const REQUEST_TIMEOUT_MS = 5 * 60 * 1e3;
 class ServerController {
-  constructor(server, projectManager, eventsHandler, store) {
+  constructor(server, projectManager, eventsHandler, store, pythonInstaller) {
     this.server = server;
     this.projectManager = projectManager;
     this.eventsHandler = eventsHandler;
     this.store = store;
+    this.pythonInstaller = pythonInstaller;
     this.init();
   }
   app = express();
@@ -10162,7 +10182,7 @@ class ServerController {
     new ProjectApi(this.eventsHandler).registerRoutes(apiRouter);
     new CommandsApi(this.eventsHandler).registerRoutes(apiRouter);
     new UsageApi(this.eventsHandler).registerRoutes(apiRouter);
-    new SystemApi(this.eventsHandler).registerRoutes(apiRouter);
+    new SystemApi(this.eventsHandler, this.pythonInstaller).registerRoutes(apiRouter);
     new TodoApi(this.eventsHandler).registerRoutes(apiRouter);
     new McpApi(this.eventsHandler).registerRoutes(apiRouter);
     new ProvidersApi(this.eventsHandler).registerRoutes(apiRouter);
@@ -12078,6 +12098,82 @@ ${JSON.stringify(part.output.value, null, 2)}
     return removedIds;
   }
 }
+const PROXY_ENV_VAR_NAMES = ["HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "http_proxy", "https_proxy", "all_proxy"];
+const getProxyEnvVars = (settings) => {
+  if (settings.proxy?.enabled && settings.proxy?.url) {
+    const url = settings.proxy.url;
+    return {
+      HTTP_PROXY: url,
+      HTTPS_PROXY: url,
+      ALL_PROXY: url,
+      http_proxy: url,
+      https_proxy: url,
+      all_proxy: url
+    };
+  }
+  return Object.fromEntries(PROXY_ENV_VAR_NAMES.map((key) => [key, ""]));
+};
+class ProxyManager {
+  currentUrl = null;
+  /**
+   * Initialize proxy from settings. Called once during app startup (first in managers init).
+   */
+  init(settings) {
+    globalAgent.bootstrap();
+    if (settings.proxy?.enabled && settings.proxy?.url) {
+      this.applyProxy(settings.proxy.url);
+    } else {
+      this.clearProxy();
+    }
+  }
+  /**
+   * React to settings changes. Called on every saveSettings().
+   * Re-initializes the proxy if the config changed.
+   */
+  settingsChanged(oldSettings, newSettings) {
+    const oldProxy = oldSettings.proxy;
+    const newProxy = newSettings.proxy;
+    if (oldProxy?.enabled !== newProxy?.enabled || oldProxy?.url !== newProxy?.url) {
+      if (newProxy?.enabled && newProxy?.url) {
+        logger.info(`[ProxyManager] Applying proxy: ${newProxy.url}`);
+        this.applyProxy(newProxy.url);
+      } else if (this.currentUrl !== null) {
+        logger.info("[ProxyManager] Clearing proxy");
+        this.clearProxy();
+      }
+    }
+  }
+  applyProxy(url) {
+    try {
+      global.GLOBAL_AGENT.HTTP_PROXY = url;
+      const proxyAgent = new undici.ProxyAgent(url);
+      undici.setGlobalDispatcher(proxyAgent);
+      this.currentUrl = url;
+      logger.info(`[ProxyManager] Proxy initialized: ${url}`);
+    } catch (error) {
+      logger.error("[ProxyManager] Failed to initialize proxy", { error: error instanceof Error ? error.message : String(error) });
+    }
+  }
+  clearProxy() {
+    try {
+      global.GLOBAL_AGENT.HTTP_PROXY = void 0;
+      undici.setGlobalDispatcher(
+        new undici.Agent({
+          headersTimeout: 30 * 60 * 1e3,
+          // 30 minutes
+          bodyTimeout: 30 * 60 * 1e3,
+          // 30 minutes
+          connectTimeout: 30 * 1e3
+          // 30 seconds
+        })
+      );
+      this.currentUrl = null;
+      logger.info("[ProxyManager] Proxy cleared");
+    } catch (error) {
+      logger.error("[ProxyManager] Failed to clear proxy", { error: error instanceof Error ? error.message : String(error) });
+    }
+  }
+}
 class AiderManager {
   constructor(task, store, modelManager, eventManager, getConnectors, pythonInstaller) {
     this.task = task;
@@ -12186,11 +12282,13 @@ class AiderManager {
       taskId: this.task.taskId,
       args
     });
+    const proxyEnvVars = getProxyEnvVars(settings);
     const env = {
       ...process.env,
       ...environmentVariables,
       ...envFromMain,
       ...envFromWeak,
+      ...proxyEnvVars,
       PYTHONPATH: AIDER_DESK_CONNECTOR_DIR,
       PYTHONUTF8: process.env.AIDER_DESK_OMIT_PYTHONUTF8 ? void 0 : "1",
       BASE_DIR: this.task.getProjectDir(),
@@ -12905,7 +13003,7 @@ class WorktreeManager {
           const addCommand = "git add -A";
           executedCommands.push(`${addCommand} (in ${worktreePath})`);
           await execWithShellPath(addCommand, { cwd: worktreePath });
-          const commitCommand = `git commit -m "TEMP_UNCOMMITTED_${Date.now()}"`;
+          const commitCommand = `git commit --no-verify -m "TEMP_UNCOMMITTED_${Date.now()}"`;
           executedCommands.push(`${commitCommand} (in ${worktreePath})`);
           await execWithShellPath(commitCommand, {
             cwd: worktreePath
@@ -13553,13 +13651,17 @@ Git output: ${err.stderr || err.stdout || err.message}`
    */
   async getUpdatedFiles(worktreePath, workingMode, mainBranch, groupMode = UpdatedFilesGroupMode.Grouped) {
     try {
+      let files;
       if (workingMode === "worktree" && mainBranch) {
         if (groupMode === UpdatedFilesGroupMode.Flat) {
-          return await this.getWorktreeFlatUpdatedFiles(worktreePath, mainBranch);
+          files = await this.getWorktreeFlatUpdatedFiles(worktreePath, mainBranch);
+        } else {
+          files = await this.getWorktreeUpdatedFiles(worktreePath, mainBranch);
         }
-        return await this.getWorktreeUpdatedFiles(worktreePath, mainBranch);
+      } else {
+        files = await this.getNonWorktreeUpdatedFiles(worktreePath);
       }
-      return await this.getNonWorktreeUpdatedFiles(worktreePath);
+      return await this.markConflictingFiles(worktreePath, files);
     } catch (error) {
       logger.warn("Failed to get updated files:", error);
       return [];
@@ -13799,6 +13901,20 @@ Git output: ${err.stderr || err.stdout || err.message}`
     }
     return fileDiffs;
   }
+  async markConflictingFiles(worktreePath, files) {
+    try {
+      const { stdout } = await execWithShellPath("git diff --name-only --diff-filter=U", { cwd: worktreePath });
+      const unmergedFiles = new Set(
+        stdout.split("\n").map((l) => l.trim()).filter((l) => l.length > 0)
+      );
+      if (unmergedFiles.size === 0) {
+        return files;
+      }
+      return files.map((f) => unmergedFiles.has(f.path) ? { ...f, hasConflicts: true } : f);
+    } catch {
+      return files;
+    }
+  }
   async restoreFile(worktreePath, filePath) {
     try {
       logger.info(`Restoring file: ${filePath}`, { worktreePath });
@@ -16320,12 +16436,16 @@ ${contentText}</agent-response>`;
     const aiderWatchFilesChanged = oldSettings.aider.watchFiles !== newSettings?.aider.watchFiles;
     const aiderCachingEnabledChanged = oldSettings.aider.cachingEnabled !== newSettings?.aider.cachingEnabled;
     const aiderConfirmBeforeEditChanged = oldSettings.aider.confirmBeforeEdit !== newSettings?.aider.confirmBeforeEdit;
+    const proxyChanged = oldSettings.proxy?.enabled !== newSettings.proxy?.enabled || oldSettings.proxy?.url !== newSettings.proxy?.url;
     if ((aiderOptionsChanged || aiderAutoCommitsChanged || aiderWatchFilesChanged || aiderCachingEnabledChanged || aiderConfirmBeforeEditChanged) && await this.shouldStartAider()) {
       logger.debug("Aider options changed, restarting Aider.");
       void this.aiderManager.start(true);
-    } else if (aiderEnvVarsChanged) {
+    } else if (aiderEnvVarsChanged || proxyChanged) {
       logger.debug("Aider environment variables changed, updating connectors.");
-      const updatedEnvironmentVariables = getEnvironmentVariablesForAider(newSettings, this.project.baseDir);
+      const updatedEnvironmentVariables = {
+        ...getEnvironmentVariablesForAider(newSettings, this.project.baseDir),
+        ...getProxyEnvVars(newSettings)
+      };
       this.sendUpdateEnvVars(updatedEnvironmentVariables);
     }
   }
@@ -16906,16 +17026,14 @@ ${diff}
         return;
       }
       if (error) {
+        this.addLogMessage("loading", void 0, true);
         const isConflict = error.gitOutput?.includes("Resolve all conflicts");
-        this.addLogMessage(
-          "error",
-          isConflict ? "worktree.rebaseConflicts" : error.getErrorDetails(),
-          true,
-          void 0,
-          isConflict ? ["abort-rebase", "resolve-conflicts-with-agent"] : void 0
-        );
+        if (!isConflict) {
+          this.addLogMessage("error", error.getErrorDetails(), true);
+        }
       }
     } catch (error) {
+      this.addLogMessage("loading", void 0, true);
       logger.error("Failed to rebase worktree:", {
         error: error instanceof Error ? error.message : String(error)
       });
@@ -16949,6 +17067,8 @@ ${diff}
     if (!activeProfile) {
       throw new Error("No active agent profile found");
     }
+    const previousTaskState = this.task.state;
+    await this.saveTask({ state: DefaultTaskState.InProgress });
     try {
       this.addLogMessage("loading", `Resolving conflicts in ${directoryName}...`);
       const files = await this.worktreeManager.listConflictedFiles(directoryPath);
@@ -17033,13 +17153,8 @@ ${diff}
         }
       });
       await Promise.all(resolutionPromises);
-      if (interruptedCount === 0) {
-        this.addLogMessage("info", "Conflicts resolved and staged. You can now continue the rebase.", true, void 0, ["continue-rebase", "abort-rebase"]);
-      } else if (interruptedCount < files.length) {
-        this.addLogMessage("warning", "Some conflicts were resolved, but some were interrupted. You can continue the rebase.", true, void 0, [
-          "continue-rebase",
-          "abort-rebase"
-        ]);
+      if (interruptedCount > 0 && interruptedCount < files.length) {
+        this.addLogMessage("warning", "Some conflicts were resolved, but some were interrupted. You can continue the rebase.", true, void 0, []);
       }
     } catch (error) {
       logger.error("Failed to resolve conflicts with agent:", error);
@@ -17048,6 +17163,8 @@ ${diff}
         error instanceof GitError ? error.getErrorDetails() : `Failed to resolve conflicts with agent: ${error instanceof Error ? error.message : String(error)}`,
         true
       );
+    } finally {
+      await this.saveTask({ state: previousTaskState });
     }
     await this.sendWorktreeIntegrationStatusUpdated();
   }
@@ -17084,17 +17201,17 @@ ${diff}
       this.addLogMessage("loading", "Continuing rebase...");
       await this.worktreeManager.continueRebase(this.task.worktree.path);
       await this.saveTask({ lastMergeState: void 0 });
-      this.addLogMessage("info", "Rebase continued", true);
+      this.addLogMessage("info", "Rebase completed", true);
     } catch (error) {
       logger.error("Failed to continue rebase:", error);
       const isConflict = error instanceof GitError && error.gitOutput?.includes("Resolve all conflicts manually");
-      this.addLogMessage(
-        "error",
-        isConflict ? "worktree.rebaseConflicts" : error instanceof GitError ? error.getErrorDetails() : `Failed to continue rebase: ${error instanceof Error ? error.message : String(error)}`,
-        true,
-        void 0,
-        isConflict ? ["abort-rebase", "resolve-conflicts-with-agent"] : void 0
-      );
+      if (!isConflict) {
+        this.addLogMessage(
+          "error",
+          error instanceof GitError ? error.getErrorDetails() : `Failed to continue rebase: ${error instanceof Error ? error.message : String(error)}`,
+          true
+        );
+      }
     }
     await this.sendUpdatedFilesUpdated();
     await this.sendWorktreeIntegrationStatusUpdated();
@@ -17158,50 +17275,53 @@ ${diff}
   async generateText(modelId, systemPrompt, prompt) {
     return this.agent.generateText(modelId, systemPrompt, prompt, this.getProjectDir());
   }
-  async runCodeInlineRequest(filename, lineNumber, userComment, createNewTask, contextSize = 5) {
-    const filePath = path.isAbsolute(filename) ? filename : path.join(this.getTaskDir(), filename);
-    const fileExtension = path.extname(filename).slice(1) || "";
-    let contextLines = [];
-    try {
-      const fileContent = await fs.readFile(filePath, "utf-8");
-      const lines = fileContent.split("\n");
-      const startLine = Math.max(0, lineNumber - contextSize - 1);
-      const endLine = Math.min(lines.length, lineNumber + contextSize);
-      contextLines = lines.slice(startLine, endLine).map((content, index) => ({
-        lineNumber: startLine + index + 1,
-        content
-      }));
-    } catch (error) {
-      logger.warn("Failed to read file for context extraction", {
-        filePath,
-        error
-      });
-    }
-    const prompt = await this.promptsManager.getCodeInlineRequestPrompt(this, {
-      filename,
-      lineNumber,
-      fileExtension,
-      contextLines,
-      userComment
-    });
+  async runCodeChangeRequests(requests, contextSize = 5, createNewTask) {
     const mode = this.getCurrentMode();
+    const promptRequests = await Promise.all(
+      requests.map(async (request) => {
+        const filePath = path.isAbsolute(request.filename) ? request.filename : path.join(this.getTaskDir(), request.filename);
+        const fileExtension = path.extname(request.filename).slice(1) || "";
+        let contextLines = [];
+        try {
+          const fileContent = await fs.readFile(filePath, "utf-8");
+          const lines = fileContent.split("\n");
+          const startLine = Math.max(0, request.lineNumber - contextSize - 1);
+          const endLine = Math.min(lines.length, request.lineNumber + contextSize);
+          contextLines = lines.slice(startLine, endLine).map((content, index) => ({
+            lineNumber: startLine + index + 1,
+            content
+          }));
+        } catch (error) {
+          logger.warn("Failed to read file for context extraction", {
+            filePath,
+            error
+          });
+        }
+        return {
+          filename: request.filename,
+          lineNumber: request.lineNumber,
+          fileExtension,
+          contextLines,
+          userComment: request.userComment
+        };
+      })
+    );
+    const prompt = await this.promptsManager.getCodeChangeRequestsPrompt(this, {
+      requests: promptRequests
+    });
     if (!createNewTask) {
+      const uniqueFiles = [...new Set(requests.map((r) => r.filename))];
       if (AIDER_MODES.includes(mode)) {
-        await this.addFiles({
-          path: filename
-        });
+        for (const filename of uniqueFiles) {
+          await this.addFiles({ path: filename });
+        }
       }
       void this.runPrompt(prompt, mode, false);
       return;
     }
-    this.eventManager.sendLog({
-      baseDir: this.project.baseDir,
-      taskId: INTERNAL_TASK_ID,
-      level: "loading",
-      message: "Creating task for inline code request..."
-    });
+    const taskName = requests.length === 1 ? `${requests[0].filename}:${requests[0].lineNumber}` : `${requests.length} change requests`;
     const newTaskData = await this.project.createNewTask({
-      name: `${filename}:${lineNumber}`,
+      name: taskName,
       sendEvent: false,
       autoApprove: true,
       activate: true,
@@ -17215,9 +17335,10 @@ ${diff}
     }
     await newTask.init();
     if (AIDER_MODES.includes(mode)) {
-      await newTask.addFiles({
-        path: filename
-      });
+      const uniqueFiles = [...new Set(requests.map((r) => r.filename))];
+      for (const filename of uniqueFiles) {
+        await newTask.addFiles({ path: filename });
+      }
     }
     this.eventManager.sendTaskCreated(newTask.task, true);
     void newTask.runPrompt(prompt, mode, false);
@@ -17379,6 +17500,9 @@ class Project {
       if (!parentTask) {
         throw new Error(`Parent task with id ${normalizedParams.parentId} not found`);
       }
+      if (!parentTask.task.createdAt) {
+        await parentTask.saveTask();
+      }
     }
     const sourceTask = parentTask || this.getMostRecentTask();
     const defaultWorkingMode = this.store.getSettings().taskSettings.defaultWorkingMode || "local";
@@ -18361,8 +18485,7 @@ const loadAnthropicCompatibleModels = async (profile, settings) => {
     const models = data.data?.map((model) => {
       return {
         id: model.id,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} Anthropic-compatible models for profile ${profile.id}`);
@@ -18475,6 +18598,11 @@ const AUGGIE_MODELS = [
     maxInputTokens: 2e5,
     maxOutputTokensLimit: 32768
   },
+  {
+    id: "claude-opus-4-7",
+    maxInputTokens: 2e5,
+    maxOutputTokensLimit: 32768
+  },
   { id: "gpt-5-1", maxInputTokens: 2e5, maxOutputTokensLimit: 16384 },
   { id: "gpt-5-2", maxInputTokens: 2e5, maxOutputTokensLimit: 16384 },
   { id: "gpt-5-4", maxInputTokens: 2e5, maxOutputTokensLimit: 16384 }
@@ -18786,8 +18914,7 @@ const loadBedrockModels = async (profile, settings) => {
       if (response.authorizationStatus === "AUTHORIZED" && response.entitlementAvailability === "AVAILABLE" && response.regionAvailability === "AVAILABLE") {
         availableModels.push({
           id: inferenceProfile.inferenceProfileId,
-          providerId: profile.id,
-          temperature: DEFAULT_MODEL_TEMPERATURE
+          providerId: profile.id
         });
         logger.debug(`Profile ${inferenceProfile.inferenceProfileId} with model ${modelId} is available and authorized`);
       } else {
@@ -18941,8 +19068,7 @@ const loadCerebrasModels = async (profile, settings) => {
       return {
         id: model.id,
         providerId: profile.id,
-        maxInputTokens: model.max_context_length,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        maxInputTokens: model.max_context_length
       };
     }) || [];
     logger.info(`Loaded ${models.length} Cerebras models for profile ${profile.id}`);
@@ -19212,8 +19338,7 @@ const loadDeepseekModels = async (profile, settings) => {
     const models = data.data?.map((m) => {
       return {
         id: m.id,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} DeepSeek models for profile ${profile.id}`);
@@ -19619,8 +19744,7 @@ const loadGpustackModels = async (profile, settings) => {
         id: model.name,
         providerId: profile.id,
         // Extract max_model_len from meta if available
-        maxInputTokens: model.meta?.max_model_len,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        maxInputTokens: model.meta?.max_model_len
       };
     }) || [];
     logger.info(`Loaded ${models.length} GPUStack models for profile ${profile.id}`);
@@ -19740,8 +19864,7 @@ const loadGroqModels = async (profile, settings) => {
     const models = data.data?.map((model) => {
       return {
         id: model.id,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} Groq models for profile ${profile.id}`);
@@ -20129,8 +20252,7 @@ const loadLmStudioModels = async (profile, settings) => {
       return {
         id: model.id,
         providerId: profile.id,
-        maxInputTokens: model.max_context_length,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        maxInputTokens: model.max_context_length
       };
     }) || [];
     logger.info(`Loaded ${models.length} LM Studio models from ${effectiveBaseUrl} for profile ${profile.id}`);
@@ -20210,7 +20332,63 @@ const loadMinimaxModels = async (profile) => {
   }
   const hardcodedModels = [
     {
-      id: "MiniMax-M2",
+      id: "MiniMax-M2.7",
+      providerId: profile.id,
+      maxInputTokens: 204800,
+      maxOutputTokensLimit: 131072,
+      inputCostPerToken: 3e-7,
+      // 0.3 per 1M tokens
+      outputCostPerToken: 12e-7,
+      // 1.2 per 1M tokens
+      cacheReadInputTokenCost: 6e-8,
+      // 0.06 per 1M tokens
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
+    },
+    {
+      id: "MiniMax-M2.7-highspeed",
+      providerId: profile.id,
+      maxInputTokens: 204800,
+      maxOutputTokensLimit: 131072,
+      inputCostPerToken: 6e-7,
+      // 0.6 per 1M tokens
+      outputCostPerToken: 24e-7,
+      // 2.4 per 1M tokens
+      cacheReadInputTokenCost: 6e-8,
+      // 0.06 per 1M tokens
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
+    },
+    {
+      id: "MiniMax-M2.5",
+      providerId: profile.id,
+      maxInputTokens: 204800,
+      maxOutputTokensLimit: 131072,
+      inputCostPerToken: 3e-7,
+      // 0.3 per 1M tokens
+      outputCostPerToken: 12e-7,
+      // 1.2 per 1M tokens
+      cacheReadInputTokenCost: 3e-8,
+      // 0.03 per 1M tokens
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
+    },
+    {
+      id: "MiniMax-M2.5-highspeed",
+      providerId: profile.id,
+      maxInputTokens: 204800,
+      maxOutputTokensLimit: 131072,
+      inputCostPerToken: 6e-7,
+      // 0.6 per 1M tokens
+      outputCostPerToken: 24e-7,
+      // 2.4 per 1M tokens
+      cacheReadInputTokenCost: 3e-8,
+      // 0.03 per 1M tokens
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
+    },
+    {
+      id: "MiniMax-M2.1",
       providerId: profile.id,
       maxInputTokens: 204800,
       maxOutputTokensLimit: 131072,
@@ -20220,12 +20398,25 @@ const loadMinimaxModels = async (profile) => {
       // 1.2 per 1M tokens
       cacheReadInputTokenCost: 3e-8,
       // 0.03 per 1M tokens
-      cacheWriteInputTokenCost: 4e-8,
-      // 0.04 per 1M tokens
-      temperature: 0.5
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
+    },
+    {
+      id: "MiniMax-M2.1-highspeed",
+      providerId: profile.id,
+      maxInputTokens: 204800,
+      maxOutputTokensLimit: 131072,
+      inputCostPerToken: 6e-7,
+      // 0.6 per 1M tokens
+      outputCostPerToken: 24e-7,
+      // 2.4 per 1M tokens
+      cacheReadInputTokenCost: 3e-8,
+      // 0.03 per 1M tokens
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
     },
     {
-      id: "MiniMax-M2-Stable",
+      id: "MiniMax-M2",
       providerId: profile.id,
       maxInputTokens: 204800,
       maxOutputTokensLimit: 131072,
@@ -20235,9 +20426,8 @@ const loadMinimaxModels = async (profile) => {
       // 1.2 per 1M tokens
       cacheReadInputTokenCost: 3e-8,
       // 0.03 per 1M tokens
-      cacheWriteInputTokenCost: 4e-8,
-      // 0.04 per 1M tokens
-      temperature: 0.5
+      cacheWriteInputTokenCost: 375e-9
+      // 0.375 per 1M tokens
     }
   ];
   return { models: hardcodedModels, success: true };
@@ -20333,6 +20523,90 @@ const minimaxProviderStrategy = {
   // Configuration helpers
   getCacheControl: getMinimaxCacheControl
 };
+const loadMistralModels = async (profile, settings) => {
+  if (!isMistralProvider(profile.provider)) {
+    return { models: [], success: false };
+  }
+  const provider = profile.provider;
+  const apiKey = provider.apiKey || "";
+  const apiKeyEnv = getEffectiveEnvironmentVariable("MISTRAL_API_KEY", settings);
+  const effectiveApiKey = apiKey || apiKeyEnv?.value || "";
+  if (!effectiveApiKey) {
+    const errorMsg = "Mistral API key is required. Please set it in Providers settings or via MISTRAL_API_KEY environment variable.";
+    logger.debug(errorMsg);
+    return { models: [], success: false };
+  }
+  try {
+    const response = await fetch("https://api.mistral.ai/v1/models", {
+      headers: { Authorization: `Bearer ${effectiveApiKey}` }
+    });
+    if (!response.ok) {
+      const errorMsg = `Mistral models API response failed: ${response.status} ${response.statusText} ${await response.text()}`;
+      logger.error(errorMsg, {
+        status: response.status,
+        statusText: response.statusText
+      });
+      return { models: [], success: false, error: errorMsg };
+    }
+    const data = await response.json();
+    const models = data.data?.map((model) => {
+      return {
+        id: model.id,
+        providerId: profile.id,
+        temperature: 0.7
+      };
+    }) || [];
+    logger.info(`Loaded ${models.length} Mistral models for profile ${profile.id}`);
+    return { models, success: true };
+  } catch (error) {
+    const errorMsg = typeof error === "string" ? error : error instanceof Error ? error.message : "Unknown error loading Mistral models";
+    logger.error("Error loading Mistral models:", error);
+    return { models: [], success: false, error: errorMsg };
+  }
+};
+const hasMistralEnvVars = (settings) => {
+  return !!getEffectiveEnvironmentVariable("MISTRAL_API_KEY", settings, void 0)?.value;
+};
+const getMistralAiderMapping = (provider, modelId) => {
+  const mistralProvider = provider.provider;
+  const envVars = {};
+  if (mistralProvider.apiKey) {
+    envVars.MISTRAL_API_KEY = mistralProvider.apiKey;
+  }
+  return {
+    modelName: `mistral/${modelId}`,
+    environmentVariables: envVars
+  };
+};
+const createMistralLlm = (profile, model, settings, projectDir) => {
+  const provider = profile.provider;
+  let apiKey = provider.apiKey;
+  if (!apiKey) {
+    const effectiveVar = getEffectiveEnvironmentVariable("MISTRAL_API_KEY", settings, projectDir);
+    if (effectiveVar) {
+      apiKey = effectiveVar.value;
+      logger.debug(`Loaded MISTRAL_API_KEY from ${effectiveVar.source}`);
+    }
+  }
+  if (!apiKey) {
+    throw new Error("Mistral API key is required in Providers settings or Aider environment variables (MISTRAL_API_KEY)");
+  }
+  const mistralProvider = mistral.createMistral({
+    apiKey,
+    headers: profile.headers
+  });
+  return mistralProvider(model.id);
+};
+const mistralProviderStrategy = {
+  // Core LLM functions
+  createLlm: createMistralLlm,
+  getUsageReport: getDefaultUsageReport,
+  // Model discovery functions
+  loadModels: loadMistralModels,
+  hasEnvVars: hasMistralEnvVars,
+  getAiderMapping: getMistralAiderMapping,
+  getModelInfo: getDefaultModelInfo
+};
 const loadOllamaModels = async (profile, settings) => {
   if (!isOllamaProvider(profile.provider)) {
     return { models: [], success: false };
@@ -20359,8 +20633,7 @@ const loadOllamaModels = async (profile, settings) => {
     const models = data?.models?.map((m) => {
       return {
         id: m.name,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} Ollama models from ${effectiveBaseUrl} for profile ${profile.id}`);
@@ -20698,8 +20971,7 @@ const loadOpenaiCompatibleModels = async (profile, settings) => {
     const models = data.data?.map((model) => {
       return {
         id: model.id,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} OpenAI-compatible models for profile ${profile.id}`);
@@ -20818,7 +21090,7 @@ const getDefaultModelTemperature$2 = (modelId) => {
   if (modelId.includes("glm-")) {
     return 0.7;
   }
-  return DEFAULT_MODEL_TEMPERATURE;
+  return void 0;
 };
 const loadOpencodeModels = async (profile, settings) => {
   if (!isOpenCodeProvider(profile.provider)) {
@@ -20949,7 +21221,7 @@ const getDefaultModelTemperature$1 = (modelId) => {
   if (modelId.includes("qwen")) {
     return 0.55;
   }
-  return DEFAULT_MODEL_TEMPERATURE;
+  return void 0;
 };
 const loadOpenrouterModels = async (profile, settings) => {
   if (!isOpenRouterProvider(profile.provider)) {
@@ -21113,7 +21385,7 @@ const getDefaultModelTemperature = (modelId) => {
   if (modelId.includes("qwen")) {
     return 0.55;
   }
-  return DEFAULT_MODEL_TEMPERATURE;
+  return void 0;
 };
 const loadRequestyModels = async (profile, settings) => {
   if (!isRequestyProvider(profile.provider)) {
@@ -21317,8 +21589,7 @@ const loadSyntheticModels = async (profile, settings) => {
     const models = data.data?.map((model) => {
       return {
         id: model.id,
-        providerId: profile.id,
-        temperature: DEFAULT_MODEL_TEMPERATURE
+        providerId: profile.id
       };
     }) || [];
     logger.info(`Loaded ${models.length} Synthetic models for profile ${profile.id}`);
@@ -21687,6 +21958,7 @@ class ModelManager {
     litellm: litellmProviderStrategy,
     lmstudio: lmStudioProviderStrategy,
     minimax: minimaxProviderStrategy,
+    mistral: mistralProviderStrategy,
     ollama: ollamaProviderStrategy,
     openai: openaiProviderStrategy,
     "openai-compatible": openaiCompatibleProviderStrategy,
@@ -23171,12 +23443,13 @@ class MemoryManager {
    */
   async storeMemory(projectId, taskId, type, content) {
     if (!await this.waitForInit() || !this.isMemoryEnabled() || !this.db) {
-      return;
+      return "";
     }
     try {
       const embedding = await this.getEmbedding(content);
+      const id = uuid.v4();
       const memoryWithVector = {
-        id: uuid.v4(),
+        id,
         type,
         content,
         taskid: taskId,
@@ -23196,8 +23469,10 @@ class MemoryManager {
         taskId: memoryWithVector.taskid,
         content: memoryWithVector.content.substring(0, 100)
       });
+      return id;
     } catch (error) {
       logger.error("Failed to store memory:", error);
+      return "";
     }
   }
   /**
@@ -23353,6 +23628,16 @@ class MemoryManager {
   isMemoryEnabled() {
     return this.isInitialized && this.store.getSettings().memory.enabled || false;
   }
+  setMemoryEnabled(enabled) {
+    const settings = this.store.getSettings();
+    this.store.saveSettings({
+      ...settings,
+      memory: {
+        ...settings.memory,
+        enabled
+      }
+    });
+  }
 }
 const AIDER_DESK_EXTENSIONS_REPO_URL = "https://github.com/hotovo/aider-desk/tree/main/packages/extensions/extensions/";
 const baseJitiOptions = {
@@ -23721,12 +24006,13 @@ class ProjectContextImpl {
   }
 }
 class ExtensionContextImpl {
-  constructor(extensionId, extensionName, store, modelManager, eventManager, project, task) {
+  constructor(extensionId, extensionName, store, modelManager, eventManager, memoryManager, project, task) {
     this.extensionId = extensionId;
     this.extensionName = extensionName;
     this.store = store;
     this.modelManager = modelManager;
     this.eventManager = eventManager;
+    this.memoryManager = memoryManager;
     this.project = project;
     this.task = task;
   }
@@ -23843,6 +24129,12 @@ class ExtensionContextImpl {
       return false;
     }
   }
+  getMemoryContext() {
+    if (!this.memoryManager) {
+      throw new Error("MemoryManager not available");
+    }
+    return this.memoryManager;
+  }
 }
 const CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 class ExtensionFetcher {
@@ -24142,11 +24434,12 @@ class ExtensionFetcher {
   }
 }
 class ExtensionManager {
-  constructor(store, modelManager, eventManager, telemetryManager, registry = new ExtensionRegistry()) {
+  constructor(store, modelManager, eventManager, telemetryManager, memoryManager, registry = new ExtensionRegistry()) {
     this.store = store;
     this.modelManager = modelManager;
     this.eventManager = eventManager;
     this.telemetryManager = telemetryManager;
+    this.memoryManager = memoryManager;
     this.registry = registry;
     this.loader = new ExtensionLoader();
     this.fetcher = new ExtensionFetcher();
@@ -24253,7 +24546,7 @@ class ExtensionManager {
       return true;
     }
     try {
-      const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+      const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project);
       await instance.onLoad(context);
       this.registry.setInitialized(filePath, true);
       this.eventManager.sendExtensionUIRefresh({
@@ -24588,7 +24881,16 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, task.project, task);
+        const context = new ExtensionContextImpl(
+          loaded.id,
+          metadata.name,
+          this.store,
+          this.modelManager,
+          this.eventManager,
+          this.memoryManager,
+          task.project,
+          task
+        );
         const tools = instance.getTools(context, mode, profile);
         if (!Array.isArray(tools)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getTools() did not return an array`);
@@ -24628,7 +24930,16 @@ class ExtensionManager {
     const registeredTools = this.getTools(task, mode, profile);
     for (const { extensionId, extensionName, tool } of registeredTools) {
       const toolId = tool.name;
-      const context = new ExtensionContextImpl(extensionId, extensionName, this.store, this.modelManager, this.eventManager, task.project, task);
+      const context = new ExtensionContextImpl(
+        extensionId,
+        extensionName,
+        this.store,
+        this.modelManager,
+        this.eventManager,
+        this.memoryManager,
+        task.project,
+        task
+      );
       if (profile.toolApprovals?.[toolId] === ToolApprovalState.Never) {
         logger.debug(`[Extensions] Skipping tool '${tool.name}' (marked as Never approved)`);
         continue;
@@ -24709,7 +25020,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project);
         const commands = instance.getCommands(context);
         if (!Array.isArray(commands)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getCommands() did not return an array`);
@@ -24743,7 +25054,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project);
         const agents = instance.getAgents(context);
         if (!Array.isArray(agents)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getAgents() did not return an array`);
@@ -24783,7 +25094,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project);
         const modes = instance.getModes(context);
         if (!Array.isArray(modes)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getModes() did not return an array`);
@@ -24836,7 +25147,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project);
         const providers = instance.getProviders(context);
         if (!Array.isArray(providers)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getProviders() did not return an array`);
@@ -24872,7 +25183,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, task);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project, task);
         const components = instance.getUIComponents(context);
         if (!Array.isArray(components)) {
           logger.error(`[Extensions] Extension '${metadata.name}' getUIComponents() did not return an array`);
@@ -24906,7 +25217,7 @@ class ExtensionManager {
       return false;
     }
     try {
-      const context = new ExtensionContextImpl(loadedExt.id, loadedExt.metadata.name, this.store, this.modelManager, this.eventManager);
+      const context = new ExtensionContextImpl(loadedExt.id, loadedExt.metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager);
       const jsx = instance.getConfigComponent(context);
       return typeof jsx === "string" && jsx.length > 0;
     } catch {
@@ -24930,7 +25241,7 @@ class ExtensionManager {
       }
       try {
         logger.debug(`[Extensions] Getting UI extension data from '${id}' for component '${componentId}'`);
-        const context = new ExtensionContextImpl(id, metadata.name, this.store, this.modelManager, this.eventManager, project, task);
+        const context = new ExtensionContextImpl(id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project, task);
         return await instance.getUIExtensionData(componentId, context);
       } catch (error) {
         logger.error(`[Extensions] Failed to get UI extension data from '${id}' for component '${componentId}':`, error);
@@ -24956,7 +25267,7 @@ class ExtensionManager {
       }
       try {
         logger.debug(`[Extensions] Executing UI extension action '${action}' from '${id}' for component '${componentId}'`);
-        const context = new ExtensionContextImpl(id, metadata.name, this.store, this.modelManager, this.eventManager, project, task);
+        const context = new ExtensionContextImpl(id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project, task);
         return await instance.executeUIExtensionAction(componentId, action, args, context);
       } catch (error) {
         logger.error(`[Extensions] Failed to execute UI extension action '${action}' from '${id}' for component '${componentId}':`, error);
@@ -24979,7 +25290,15 @@ class ExtensionManager {
         return null;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, loaded.metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(
+          loaded.id,
+          loaded.metadata.name,
+          this.store,
+          this.modelManager,
+          this.eventManager,
+          this.memoryManager,
+          project
+        );
         const jsx = loaded.instance.getConfigComponent(context);
         if (typeof jsx !== "string" || jsx.length === 0) {
           return null;
@@ -25007,7 +25326,15 @@ class ExtensionManager {
         return null;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, loaded.metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(
+          loaded.id,
+          loaded.metadata.name,
+          this.store,
+          this.modelManager,
+          this.eventManager,
+          this.memoryManager,
+          project
+        );
         return await loaded.instance.getConfigData(context);
       } catch (error) {
         logger.error(`[Extensions] Failed to get config data from extension '${extensionId}':`, error);
@@ -25031,7 +25358,15 @@ class ExtensionManager {
         return null;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, loaded.metadata.name, this.store, this.modelManager, this.eventManager, project, void 0);
+        const context = new ExtensionContextImpl(
+          loaded.id,
+          loaded.metadata.name,
+          this.store,
+          this.modelManager,
+          this.eventManager,
+          this.memoryManager,
+          project
+        );
         return await loaded.instance.saveConfigData(configData, context);
       } catch (error) {
         logger.error(`[Extensions] Failed to save config data for extension '${extensionId}':`, error);
@@ -25064,7 +25399,7 @@ class ExtensionManager {
         continue;
       }
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, void 0, void 0);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager);
         const agents = instance.getAgents(context);
         if (!Array.isArray(agents)) {
           continue;
@@ -25100,7 +25435,7 @@ class ExtensionManager {
     }
     const { extensionId, extensionName, command } = registered;
     try {
-      const context = new ExtensionContextImpl(extensionId, extensionName, this.store, this.modelManager, this.eventManager, project, task);
+      const context = new ExtensionContextImpl(extensionId, extensionName, this.store, this.modelManager, this.eventManager, this.memoryManager, project, task);
       logger.debug(`[Extensions] Executing command '${commandName}' from extension '${extensionName}'`);
       await command.execute(args, context);
       logger.debug(`[Extensions] Command '${commandName}' executed successfully`);
@@ -25338,7 +25673,7 @@ class ExtensionManager {
       }
       logger.debug(`[Extensions] Dispatching event '${String(eventName)}' to extension '${metadata.name}'`);
       try {
-        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, project, task);
+        const context = new ExtensionContextImpl(loaded.id, metadata.name, this.store, this.modelManager, this.eventManager, this.memoryManager, project, task);
         const result = await handler.call(instance, currentEvent, context);
         if (result && typeof result === "object") {
           const partialEvent = result;
@@ -25361,13 +25696,13 @@ class ExtensionManager {
    * @returns Sorted array of extensions
    */
   sortExtensionsForDispatch(extensions, projectDir) {
-    const global = extensions.filter((e) => !e.projectDir);
+    const global2 = extensions.filter((e) => !e.projectDir);
     const projectSpecific = extensions.filter((e) => e.projectDir === projectDir);
-    return [...global, ...projectSpecific];
+    return [...global2, ...projectSpecific];
   }
 }
 class EventsHandler {
-  constructor(projectManager, store, mcpManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, windowManager) {
+  constructor(projectManager, store, mcpManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, proxyManager, windowManager) {
     this.projectManager = projectManager;
     this.store = store;
     this.mcpManager = mcpManager;
@@ -25381,6 +25716,7 @@ class EventsHandler {
     this.agentProfileManager = agentProfileManager;
     this.memoryManager = memoryManager;
     this.extensionManager = extensionManager;
+    this.proxyManager = proxyManager;
     this.windowManager = windowManager;
   }
   loadSettings() {
@@ -25389,6 +25725,7 @@ class EventsHandler {
   async saveSettings(newSettings) {
     const oldSettings = this.store.getSettings();
     this.store.saveSettings(newSettings);
+    this.proxyManager.settingsChanged(oldSettings, newSettings);
     void this.projectManager.settingsChanged(oldSettings, newSettings);
     this.telemetryManager.settingsChanged(oldSettings, newSettings);
     void this.memoryManager.settingsChanged(oldSettings, newSettings);
@@ -25530,8 +25867,8 @@ class EventsHandler {
     const mode = this.store.getProjectSettings(baseDir).currentMode || "agent";
     await task.handoffConversation(mode, focus);
   }
-  async runCodeInlineRequest(baseDir, taskId, filename, lineNumber, userComment, createNewTask) {
-    await this.projectManager.getProject(baseDir).getTask(taskId)?.runCodeInlineRequest(filename, lineNumber, userComment, createNewTask);
+  async runCodeChangeRequests(baseDir, taskId, requests, createNewTask) {
+    await this.projectManager.getProject(baseDir).getTask(taskId)?.runCodeChangeRequests(requests, 5, createNewTask);
   }
   async loadInputHistory(baseDir) {
     return await this.projectManager.getProject(baseDir).loadInputHistory();
@@ -25761,8 +26098,9 @@ class EventsHandler {
     }
     await task.restoreFile(filePath);
   }
-  async readFile(baseDir, filePath) {
-    const absolutePath = path.isAbsolute(filePath) ? filePath : path.join(baseDir, filePath);
+  async readFile(baseDir, taskId, filePath) {
+    const task = this.projectManager.getProject(baseDir).getTask(taskId);
+    const absolutePath = path.isAbsolute(filePath) ? filePath : task ? await task.resolveContextFilePath(filePath) ?? path.join(baseDir, filePath) : path.join(baseDir, filePath);
     const fileContentBuffer = await fs.readFile(absolutePath);
     if (istextorbinary.isBinary(filePath, fileContentBuffer)) {
       throw new Error("Cannot read binary file");
@@ -26387,7 +26725,7 @@ class PromptsManager {
       "conflict-resolution-system",
       "update-task-state",
       "handoff",
-      "code-inline-request"
+      "code-change-requests"
     ];
   }
   async loadGlobalTemplateSource(name) {
@@ -26664,8 +27002,8 @@ ${content}
     };
     return await this.render("handoff", data, task.getProjectDir(), task);
   };
-  getCodeInlineRequestPrompt = async (task, data) => {
-    return await this.render("code-inline-request", data, task.getProjectDir(), task);
+  getCodeChangeRequestsPrompt = async (task, data) => {
+    return await this.render("code-change-requests", data, task.getProjectDir(), task);
   };
 }
 const execAsync = util.promisify(child_process.exec);
@@ -26925,6 +27263,8 @@ class PythonDependenciesInstaller {
   }
 }
 const initManagers = async (store, windowManager) => {
+  const proxyManager = new ProxyManager();
+  proxyManager.init(store.getSettings());
   const telemetryManager = new TelemetryManager(store);
   telemetryManager.init().catch((error) => {
     logger.error("[Telemetry] Telemetry initialization failed, continuing without analytics:", error);
@@ -26943,7 +27283,7 @@ const initManagers = async (store, windowManager) => {
   memoryManager.init().catch((error) => {
     logger.error("[Memory] Memory system initialization failed, continuing without memories:", error);
   });
-  const extensionManager = new ExtensionManager(store, modelManager, eventManager, telemetryManager);
+  const extensionManager = new ExtensionManager(store, modelManager, eventManager, telemetryManager, memoryManager);
   extensionManager.init().catch((error) => {
     logger.error("[Extensions] Extension system initialization failed, continuing without extensions:", error);
   });
@@ -26988,9 +27328,10 @@ const initManagers = async (store, windowManager) => {
     agentProfileManager,
     memoryManager,
     extensionManager,
+    proxyManager,
     windowManager
   );
-  const serverController = new ServerController(httpServer, projectManager, eventsHandler, store);
+  const serverController = new ServerController(httpServer, projectManager, eventsHandler, store, pythonInstaller);
   const connectorManager = new ConnectorManager(httpServer, projectManager, eventManager);
   httpServer.listen(SERVER_PORT);
   logger.info(`AiderDesk headless server listening on http://localhost:${SERVER_PORT}`);
@@ -27599,6 +27940,10 @@ const DEFAULT_SETTINGS = {
   extensions: {
     repositories: [AIDER_DESK_EXTENSIONS_REPO_URL],
     disabled: []
+  },
+  proxy: {
+    enabled: false,
+    url: ""
   }
 };
 const compareBaseDirs = (baseDir1, baseDir2) => {