@aiderdesk/aiderdesk 0.66.0 → 0.67.0

package/out/runner.js

@@ -231,6 +231,7 @@ const TASKS_TOOL_GET_TASK_MESSAGE = "get_task_message";
 const TASKS_TOOL_CREATE_TASK = "create_task";
 const TASKS_TOOL_DELETE_TASK = "delete_task";
 const TASKS_TOOL_SEARCH_TASK = "search_task";
+const TASKS_TOOL_RUN_PROMPT = "run_prompt";
 const TASKS_TOOL_SEARCH_PARENT_TASK = "search_parent_task";
 const TASKS_TOOL_DESCRIPTIONS = {
   [TASKS_TOOL_LIST_TASKS]: "List all tasks in the current project. Returns basic information for each task including id, name, and creation/update timestamps. Use this to get an overview of all available tasks before performing specific task operations.",
@@ -239,6 +240,7 @@ const TASKS_TOOL_DESCRIPTIONS = {
   [TASKS_TOOL_CREATE_TASK]: "Create a new task in the current project with an initial prompt. Optionally use user-provided agentProfileId to use a different agent, a modelId to override the model, or a parentTaskId (if available) to create a subtask of another task. The new task will start with the provided prompt as its first user message. Use this to begin new work streams, separate different aspects of a project, or break down complex tasks into manageable subtasks. Use execute to create a task and wait for the task to be finished. Use executeInBackground to create a task in the background without waiting for the task to be finished.",
   [TASKS_TOOL_DELETE_TASK]: "Permanently delete a task and all its associated data including messages, context files, and metadata. This action cannot be undone. Note that you cannot delete the currently active task. Use this to clean up completed or abandoned tasks, but be cautious as this removes all task history permanently.",
   [TASKS_TOOL_SEARCH_TASK]: "Search content within a specific task using semantic search. Use natural language queries with 2-5 descriptive words including key concepts and context. Searches through task conversation history and context files. Use this to find relevant information, discussions, or code snippets within a task.",
+  [TASKS_TOOL_RUN_PROMPT]: "Run a prompt on an existing task. The task must already exist (use create_task first if needed). Use this to send additional instructions to a task, continue work on an existing task, or delegate follow-up work. By default, waits for the prompt to complete before returning. Use executeInBackground to run without waiting.",
   [TASKS_TOOL_SEARCH_PARENT_TASK]: "Search content within parent task using semantic search. Use natural language queries with 2-5 descriptive words including key concepts and context. Automatically searches parent task conversation history and context files."
 };
 const WorktreeSchema = zod.z.object({
@@ -257,6 +259,13 @@ const MergeStateSchema = zod.z.object({
 });
 const AIDER_MODES = ["code", "ask", "architect", "context"];
 const AIDER_COMMANDS = ["commit", "map", "map-refresh", "tokens", "test"];
+var AutonomyMode = /* @__PURE__ */ ((AutonomyMode2) => {
+  AutonomyMode2["Manual"] = "manual";
+  AutonomyMode2["Guided"] = "guided";
+  AutonomyMode2["Autonomous"] = "autonomous";
+  return AutonomyMode2;
+})(AutonomyMode || {});
+const DEFAULT_AUTONOMY_MODE = "guided";
 var DiffViewMode = /* @__PURE__ */ ((DiffViewMode2) => {
   DiffViewMode2["SideBySide"] = "side-by-side";
   DiffViewMode2["Unified"] = "unified";
@@ -300,7 +309,7 @@ const ProjectSettingsSchema = zod.z.object({
   thinkingTokens: zod.z.string().optional(),
   currentMode: zod.z.string(),
   weakModelLocked: zod.z.boolean().optional(),
-  autoApproveLocked: zod.z.boolean().optional(),
+  autonomyModeLocked: zod.z.boolean().optional(),
   updatedFilesGroupMode: zod.z.enum(["grouped", "flat"]).default("flat"),
   disabledRuleFiles: zod.z.array(zod.z.string()).default([]),
   contextSidebarSectionsOrder: zod.z.array(zod.z.string()).default([]),
@@ -339,6 +348,12 @@ var ContextCompactionType = /* @__PURE__ */ ((ContextCompactionType2) => {
   ContextCompactionType2["Smart"] = "smart";
   return ContextCompactionType2;
 })(ContextCompactionType || {});
+var FileWatchMode = /* @__PURE__ */ ((FileWatchMode2) => {
+  FileWatchMode2["Auto"] = "auto";
+  FileWatchMode2["Native"] = "native";
+  FileWatchMode2["Polling"] = "polling";
+  return FileWatchMode2;
+})(FileWatchMode || {});
 var MemoryEmbeddingProgressPhase = /* @__PURE__ */ ((MemoryEmbeddingProgressPhase2) => {
   MemoryEmbeddingProgressPhase2["Idle"] = "idle";
   MemoryEmbeddingProgressPhase2["LoadingModel"] = "loading-model";
@@ -372,7 +387,7 @@ const TaskDataSchema = zod.z.object({
   lastMergeState: MergeStateSchema.optional(),
   aiderTotalCost: zod.z.number(),
   agentTotalCost: zod.z.number(),
-  autoApprove: zod.z.boolean().optional(),
+  autonomyMode: zod.z.nativeEnum(AutonomyMode).optional(),
   agentProfileId: zod.z.string().optional(),
   provider: zod.z.string().optional(),
   model: zod.z.string().optional(),
@@ -886,6 +901,9 @@ if (process.env.NODE_ENV !== "production" || process.env.AIDER_DESK_HEADLESS ===
 const initEventLogging = (eventManager) => {
   eventTransport.setEventManager(eventManager);
 };
+const isAutoApprove = (task) => {
+  return task.task.autonomyMode !== AutonomyMode.Manual;
+};
 class ApprovalManager {
   constructor(task, profile) {
     this.task = task;
@@ -913,7 +931,7 @@ class ApprovalManager {
     key = extensionResult.key;
     text = extensionResult.text;
     subject = extensionResult.subject;
-    if (this.task.task.autoApprove) {
+    if (isAutoApprove(this.task)) {
       return [true, void 0];
     }
     const isApprovedFromSet = this.alwaysApproveForRunKeys.has(key) || (this.profile.toolApprovals[key] || ToolApprovalState.Always) === ToolApprovalState.Always;
@@ -1494,6 +1512,7 @@ const AVAILABLE_PROVIDERS = [
   "lmstudio",
   "minimax",
   "mistral",
+  "neuralwatt",
   "ollama",
   "openai",
   "openai-compatible",
@@ -1539,6 +1558,7 @@ 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 isNeuralwattProvider = (provider) => provider.name === "neuralwatt";
 const isSyntheticProvider = (provider) => provider.name === "synthetic";
 const DEFAULT_PROVIDER_MODELS = {
   "alibaba-plan": "qwen3-coder-plus",
@@ -1559,7 +1579,8 @@ const DEFAULT_PROVIDER_MODELS = {
   synthetic: "hf:zai-org/GLM-4.7",
   "zai-plan": "glm-5.1",
   minimax: "MiniMax-M2.7",
-  mistral: "mistral-large-latest"
+  mistral: "mistral-large-latest",
+  neuralwatt: "claude-sonnet-4-6"
 };
 const DEFAULT_AIDER_MAIN_MODEL = `anthropic/${DEFAULT_PROVIDER_MODELS.anthropic}`;
 const DEFAULT_AGENT_PROFILE_ID = "default";
@@ -1964,6 +1985,12 @@ const getDefaultProviderParams = (providerName) => {
         apiKey: ""
       };
       break;
+    case "neuralwatt":
+      provider = {
+        name: "neuralwatt",
+        apiKey: ""
+      };
+      break;
     case "gemini-cli":
       provider = {
         name: "gemini-cli",
@@ -2086,7 +2113,7 @@ class TelemetryManager {
         useTodoTools: profile.useTodoTools,
         includeContextFiles: profile.includeContextFiles,
         includeRepoMap: profile.includeRepoMap,
-        autoApprove: task?.autoApprove ?? false,
+        autonomyMode: task?.autonomyMode ?? "guided",
         enabledMcpServersCount: profile.enabledServers.length,
         totalMcpServersCount: Object.keys(this.store.getSettings().mcpServers).length
       }
@@ -2245,7 +2272,8 @@ const readApiKeyFromConfFile = (filePath, envVarName) => {
           OPENCODE_API_KEY: ["opencode"],
           REQUESTY_API_KEY: ["requesty"],
           SYNTHETIC_API_KEY: ["synthetic"],
-          MISTRAL_API_KEY: ["mistral"]
+          MISTRAL_API_KEY: ["mistral"],
+          NEURALWATT_API_KEY: ["neuralwatt"]
         };
         const providerNames = envVarToProviderName[envVarName] || [envVarName.replace(/_API_KEY$/, "").toLowerCase()];
         const apiKeys = Array.isArray(apiKeyValue) ? apiKeyValue : [apiKeyValue];
@@ -2411,7 +2439,7 @@ const getDefaultProjectSettings = (store, providerModels, baseDir, defaultAgentP
     modelEditFormats: {},
     currentMode: "agent",
     agentProfileId: defaultAgentProfileId,
-    autoApproveLocked: false,
+    autonomyModeLocked: false,
     updatedFilesGroupMode: "flat",
     disabledRuleFiles: [],
     contextSidebarSectionsOrder: [],
@@ -3259,7 +3287,7 @@ File size limit (${sizeLimit.toFixed(1)} KB) exceeded. Use shell commands (e.g.,
   }
   return resultLines.join("\n");
 };
-const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTokens = 5e4) => {
+const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTokens = 5e4, saveToFile = true, truncationSuffix) => {
   const lines = content.split("\n");
   const sizeBytes = Buffer.byteLength(content, "utf8");
   const sizeKB = sizeBytes / 1024;
@@ -3267,10 +3295,13 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
   if (lines.length <= maxLines && sizeKB <= maxSizeKB && tokenCount <= maxTokens) {
     return content;
   }
-  const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 8);
-  const tmpFileName = `aider-desk-tool-result-${id}.txt`;
-  const tmpFilePath = path.join(os.tmpdir(), tmpFileName);
-  await fs.writeFile(tmpFilePath, content, "utf8");
+  let tmpFilePath;
+  if (saveToFile) {
+    const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 8);
+    const tmpFileName = `aider-desk-tool-result-${id}.txt`;
+    tmpFilePath = path.join(os.tmpdir(), tmpFileName);
+    await fs.writeFile(tmpFilePath, content, "utf8");
+  }
   const reasons = [];
   if (lines.length > maxLines) {
     reasons.push(`${lines.length} lines exceeded limit of ${maxLines}`);
@@ -3281,6 +3312,13 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
   if (tokenCount > maxTokens) {
     reasons.push(`${tokenCount} tokens exceeded limit of ${maxTokens}`);
   }
+  const getSuffix = () => {
+    if (truncationSuffix) {
+      return truncationSuffix;
+    }
+    const fileNote = tmpFilePath ? ` Full content saved to ${tmpFilePath}.` : "";
+    return `Content truncated (${reasons.join(", ")}).${fileNote}`;
+  };
   if (tokenCount > maxTokens) {
     const headBudget = Math.floor(maxTokens / 2);
     const tailBudget = maxTokens - headBudget;
@@ -3313,6 +3351,14 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
 ... ${omittedLines} lines omitted (${reasons.join(", ")}). Full content saved to ${tmpFilePath}.
 
 `;
+    if (truncationSuffix) {
+      const suffixNotice = `
+
+... ${omittedLines} lines omitted. ${truncationSuffix}
+
+`;
+      return headLines.join("\n") + suffixNotice + tailLines.join("\n");
+    }
     return headLines.join("\n") + truncationNotice + tailLines.join("\n");
   }
   let preview;
@@ -3324,7 +3370,7 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
     preview = lines.slice(0, maxLines).join("\n");
   }
   return preview + `
-... Content truncated (${reasons.join(", ")}). Full content saved to ${tmpFilePath}.`;
+... ${getSuffix()}`;
 };
 const NETWORK_ERROR_CODES = ["ECONNRESET", "EPIPE", "ETIMEDOUT", "ECONNREFUSED", "ENOTFOUND", "ENETUNREACH", "EAI_AGAIN"];
 const UNDICI_ERROR_PREFIX = "UND_ERR_";
@@ -3744,10 +3790,17 @@ Do not use escape characters \\ in the string like \\n or \\" and others. Do not
         }
         const results = [];
         const outputLineRegex = /^(.+?)([:-])(\d+)\2(.*)$/;
+        let pendingBeforeContext = [];
+        let afterContextBreak = false;
         for (let rawLine of outputLines) {
           if (rawLine.endsWith("\r")) {
             rawLine = rawLine.slice(0, -1);
           }
+          if (rawLine === "--") {
+            pendingBeforeContext = [];
+            afterContextBreak = true;
+            continue;
+          }
           const line = rawLine;
           const match = outputLineRegex.exec(line);
           if (!match) {
@@ -3761,18 +3814,28 @@ Do not use escape characters \\ in the string like \\n or \\" and others. Do not
           const filePath = rawFilePath.startsWith("./") ? rawFilePath.slice(2) : rawFilePath;
           const isMatch = separator === ":";
           if (isMatch) {
+            const context = pendingBeforeContext.length > 0 ? [...pendingBeforeContext, content] : void 0;
             results.push({
               filePath,
               lineNumber: lineNum,
-              lineContent: content
+              lineContent: content,
+              context
             });
+            pendingBeforeContext = [];
+            afterContextBreak = false;
           } else {
-            const lastResult = results[results.length - 1];
-            if (lastResult) {
-              if (!lastResult.context) {
-                lastResult.context = [];
+            if (afterContextBreak) {
+              pendingBeforeContext.push(content);
+            } else {
+              const lastResult = results[results.length - 1];
+              if (lastResult) {
+                if (!lastResult.context) {
+                  lastResult.context = [];
+                }
+                lastResult.context.push(content);
+              } else {
+                pendingBeforeContext.push(content);
               }
-              lastResult.context.push(content);
             }
           }
           if (results.length >= maxResults) {
@@ -4462,15 +4525,15 @@ const createTasksToolset = (settings, task, profile, promptContext) => {
       parentTaskId: zod.z.string().nullable().optional().describe(
         "Optional ID of the parent task. If provided, the new task will be created as a subtask of the specified parent. When asSubtask is specified as true, this is not needed as parent ID is resolved automatically."
       ),
-      autoApprove: zod.z.boolean().optional().default(false).describe(
-        "If true, the task will be created with auto-approve enabled. Set autoApprove to true when no planning is needed, just execution of the task with all the work."
+      autonomyMode: zod.z.enum(AutonomyMode).optional().describe(
+        'The autonomy mode for the new task. "manual" requires approval for every tool and plan, "guided" (default) auto-approves tools but waits for plan approval from user, "autonomous" runs without interruption.'
       ),
       worktree: zod.z.boolean().optional().default(false).describe("If true, the task will be created in worktree mode. Use only when explicitly requested by the user."),
       executeAndWait: zod.z.boolean().optional().default(false).describe("If true, the task will be created and executed immediately and the tool will wait for it to complete before returning."),
       executeInBackground: zod.z.boolean().optional().default(false).describe("If true, the task will be created and executed in the background.")
     }),
     execute: async (input, { toolCallId }) => {
-      const { prompt, name, agentProfileId, modelId, mode = "agent", asSubtask = false, autoApprove, worktree, executeAndWait, executeInBackground } = input;
+      const { prompt, name, agentProfileId, modelId, mode = "agent", asSubtask = false, autonomyMode, worktree, executeAndWait, executeInBackground } = input;
       const parentTaskId = asSubtask ? task.task.parentId || task.taskId : "parentTaskId" in input ? input.parentTaskId : void 0;
       task.addToolMessage(toolCallId, TASKS_TOOL_GROUP_NAME, TASKS_TOOL_CREATE_TASK, input, void 0, void 0, promptContext);
       const toolName = `${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_CREATE_TASK}`;
@@ -4488,7 +4551,7 @@ Parent Task ID: ${parentTaskId || "none (top-level task)"}` : ""}`;
         const newTask = await task.getProject().createNewTask({
           parentId: parentTaskId || null,
           name: name || "",
-          autoApprove,
+          autonomyMode,
           workingMode: worktree ? "worktree" : "local"
         });
         const updates = {};
@@ -4566,6 +4629,66 @@ Parent Task ID: ${parentTaskId || "none (top-level task)"}` : ""}`;
       }
     }
   });
+  const runPromptTool = ai.tool({
+    description: TASKS_TOOL_DESCRIPTIONS[TASKS_TOOL_RUN_PROMPT],
+    inputSchema: zod.z.object({
+      taskId: zod.z.string().describe("The ID of the existing task to run the prompt on"),
+      prompt: zod.z.string().describe("The prompt to run on the task"),
+      mode: zod.z.string().optional().describe("Optional mode to use for the prompt. Use only when explicitly requested by the user."),
+      executeAndWait: zod.z.boolean().optional().default(true).describe("If true (default), the tool will wait for the prompt to complete before returning. If false, the prompt will run in the background.")
+    }),
+    execute: async (input, { toolCallId }) => {
+      const { taskId, prompt, mode, executeAndWait = true } = input;
+      task.addToolMessage(
+        toolCallId,
+        TASKS_TOOL_GROUP_NAME,
+        TASKS_TOOL_RUN_PROMPT,
+        { taskId, prompt, mode, executeAndWait },
+        void 0,
+        void 0,
+        promptContext
+      );
+      const toolName = `${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_RUN_PROMPT}`;
+      const questionKey = toolName;
+      const questionText = `Approve running prompt on task ${taskId}?`;
+      const questionSubject = `Task ID: ${taskId}
+Prompt: ${prompt}${executeAndWait ? "\nWait for completion: true" : "\nRun in background: true"}`;
+      const [isApproved, userInput] = await approvalManager.handleToolApproval(toolName, input, questionKey, questionText, questionSubject);
+      if (!isApproved) {
+        return `Running prompt on task denied by user. Reason: ${userInput}`;
+      }
+      try {
+        const targetTask = task.getProject().getTask(taskId);
+        if (!targetTask) {
+          return `Task with ID ${taskId} not found`;
+        }
+        const effectiveMode = mode || targetTask.task.currentMode || "agent";
+        const run = targetTask.runPrompt(prompt, effectiveMode, false);
+        if (executeAndWait) {
+          await run;
+        }
+        const taskState = targetTask.task.state;
+        const contextMessages = await targetTask.getContextMessages();
+        let resultMessage = executeAndWait ? "Prompt has been executed successfully" : "Prompt has been started in the background";
+        if (executeAndWait && taskState === DefaultTaskState.Interrupted) {
+          resultMessage = "Task has been interrupted";
+        } else if (executeAndWait && taskState === DefaultTaskState.Delegated) {
+          resultMessage = "Task has been delegated to a subagent";
+        }
+        return {
+          taskId,
+          result: resultMessage,
+          state: taskState,
+          ...executeAndWait && contextMessages.length > 0 && {
+            lastMessage: contextMessages[contextMessages.length - 1]
+          }
+        };
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return `Error running prompt on task: ${errorMessage}`;
+      }
+    }
+  });
   const searchTaskTool = ai.tool({
     description: TASKS_TOOL_DESCRIPTIONS[TASKS_TOOL_SEARCH_TASK],
     inputSchema: zod.z.object({
@@ -4632,6 +4755,7 @@ Please, consider reporting an issue at https://github.com/hotovo/aider-desk/issu
     [`${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_GET_TASK_MESSAGE}`]: getTaskMessageTool,
     [`${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_CREATE_TASK}`]: createTaskTool,
     [`${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_DELETE_TASK}`]: deleteTaskTool,
+    [`${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_RUN_PROMPT}`]: runPromptTool,
     [`${TASKS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${TASKS_TOOL_SEARCH_TASK}`]: searchTaskTool
   };
   const filteredTools = {};
@@ -4865,7 +4989,7 @@ const createAiderToolset = (task, profile, promptContext) => {
       }
       task.addToolMessage(toolCallId, AIDER_TOOL_GROUP_NAME, AIDER_TOOL_RUN_PROMPT, { prompt }, void 0, void 0, aiderPromptContext);
       const responses = await task.sendPromptToAider(prompt, aiderPromptContext, "code", [], void 0, {
-        autoApprove: task.task.autoApprove,
+        autoApprove: task.task.autonomyMode !== AutonomyMode.Manual,
         denyCommands: true
       });
       task.addLogMessage("loading");
@@ -6071,7 +6195,8 @@ const addImportantReminders = async (task, profile, projectProfiles, userRequest
 ${subagents}`);
     }
   }
-  if (!task.task.autoApprove && !profile.isSubagent) {
+  const shouldPresentPlan = task.task.autonomyMode !== AutonomyMode.Autonomous;
+  if (shouldPresentPlan && !profile.isSubagent) {
     reminders.push("Before making any complex changes, present the plan and wait for my approval.");
   }
   if (task.getTaskDir() !== task.getProjectDir()) {
@@ -6770,7 +6895,8 @@ ${fileList}`
           };
         })
       ] : prompt,
-      promptContext
+      promptContext,
+      timestamp: Date.now()
     } : null;
     if (userRequestMessage) {
       logger.info("User request message created:", {
@@ -7037,31 +7163,6 @@ ${fileList}`
           return extensionResult2.optimizedMessages ?? optimized;
         };
         const optimizedMessages = await getOptimizedMessages();
-        logger.info("Optimized messages for LLM:", {
-          count: optimizedMessages.length,
-          lastUserMessage: (() => {
-            for (let i = optimizedMessages.length - 1; i >= 0; i--) {
-              if (optimizedMessages[i].role === "user") {
-                const msg = optimizedMessages[i];
-                return {
-                  index: i,
-                  contentType: typeof msg.content,
-                  contentIsArray: Array.isArray(msg.content),
-                  contentPreview: typeof msg.content === "string" ? msg.content.substring(0, 200) : Array.isArray(msg.content) ? msg.content.map((p) => ({
-                    type: p.type,
-                    ...p.type === "text" ? { textPreview: p.text?.substring(0, 100) } : {},
-                    ...p.type === "image" ? {
-                      mediaType: p.mediaType,
-                      imageType: typeof p.image,
-                      imagePreview: typeof p.image === "string" ? p.image.substring(0, 80) : void 0
-                    } : {}
-                  })) : String(msg.content).substring(0, 200)
-                };
-              }
-            }
-            return null;
-          })()
-        });
         return {
           providerOptions,
           model: ai.wrapLanguageModel({
@@ -7086,7 +7187,7 @@ ${fileList}`
       let iterationCount = 0;
       let retryCount = 0;
       while (true) {
-        logger.info(`Starting iteration ${iterationCount}`);
+        logger.info(`Starting iteration ${iterationCount}`, { task: task.taskId });
         iterationCount++;
         if (profile.maxIterations > 0 && iterationCount > profile.maxIterations) {
           logger.warn(`Max iterations (${profile.maxIterations}) reached. Stopping agent.`);
@@ -7783,14 +7884,16 @@ ${fileList}`
           ...message,
           id: currentResponseId,
           usageReport,
-          promptContext
+          promptContext,
+          timestamp: Date.now()
         });
       } else if (message.role === "tool") {
         messages.push({
           ...message,
           // @ts-expect-error the id is there
           id: message.id || uuid.v4(),
-          promptContext
+          promptContext,
+          timestamp: Date.now()
         });
       }
     });
@@ -7903,6 +8006,52 @@ ${extractTextContent(userRequestMessage.content)}`;
     return true;
   }
 }
+let isDockerCache;
+const isDocker = () => {
+  if (isDockerCache !== void 0) {
+    return isDockerCache;
+  }
+  try {
+    isDockerCache = fs__namespace.existsSync("/.dockerenv") || fs__namespace.existsSync("/run/.containerenv");
+  } catch {
+    isDockerCache = false;
+  }
+  return isDockerCache;
+};
+const isNetworkDrive = (drivePath) => {
+  try {
+    const driveLetter = drivePath.charAt(0).toUpperCase();
+    const output = child_process.execSync(`net use ${driveLetter}:`, {
+      encoding: "utf8",
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return output.includes("\\\\") || output.includes("//");
+  } catch {
+    return false;
+  }
+};
+const shouldUsePolling = (watchPath, mode = FileWatchMode.Auto) => {
+  if (mode === FileWatchMode.Polling) {
+    return true;
+  }
+  if (mode === FileWatchMode.Native) {
+    return false;
+  }
+  if (isDocker()) {
+    logger.debug(`[FileWatch] Docker environment detected, using polling for ${watchPath}`);
+    return true;
+  }
+  if (process.platform === "win32") {
+    const isUncPath = watchPath.startsWith("\\\\") || watchPath.startsWith("//");
+    const isNetworkLetterDrive = /^[A-Za-z]:/.test(watchPath) && isNetworkDrive(watchPath);
+    if (isUncPath || isNetworkLetterDrive) {
+      logger.debug(`[FileWatch] Network path detected (${watchPath}), using polling`);
+      return true;
+    }
+  }
+  return false;
+};
 const getGlobalAgentsDir = () => path__namespace.join(os.homedir(), AIDER_DESK_AGENTS_DIR);
 const getProjectAgentsDir = (projectDir) => path__namespace.join(projectDir, AIDER_DESK_AGENTS_DIR);
 const getAgentsDirForProfile = (profile) => profile.projectDir ? getProjectAgentsDir(profile.projectDir) : getGlobalAgentsDir();
@@ -7935,9 +8084,10 @@ const getAllRuleFilesForProfile = async (profile, dirName) => {
   return ruleFiles;
 };
 class AgentProfileManager {
-  constructor(eventManager, extensionManager) {
+  constructor(eventManager, extensionManager, store) {
     this.eventManager = eventManager;
     this.extensionManager = extensionManager;
+    this.store = store;
     this.extensionsChangeListener = () => {
       this.sendAgentProfilesUpdated();
     };
@@ -8052,12 +8202,12 @@ class AgentProfileManager {
     }
     const watcher = chokidar.watch(agentsDir, {
       persistent: true,
-      usePolling: true,
+      usePolling: shouldUsePolling(agentsDir, this.store.getSettings().fileWatchMode),
       ignoreInitial: true
     });
     const rulesWatcher = chokidar.watch(path__namespace.join(agentsDir, "*", AIDER_DESK_RULES_DIR), {
       persistent: true,
-      usePolling: true,
+      usePolling: shouldUsePolling(agentsDir, this.store.getSettings().fileWatchMode),
       ignoreInitial: true
     });
     const reloadFunction = () => this.debounceReloadProfiles(agentsDir);
@@ -8455,6 +8605,22 @@ class AgentProfileManager {
     this.directoryWatchers.clear();
     this.profiles.clear();
   }
+  async settingsChanged(oldSettings, newSettings) {
+    if (oldSettings.fileWatchMode === newSettings.fileWatchMode) {
+      return;
+    }
+    const watchedDirs = Array.from(this.directoryWatchers.keys());
+    for (const watcher of this.directoryWatchers.values()) {
+      await watcher.close();
+    }
+    this.directoryWatchers.clear();
+    for (const dir of watchedDirs) {
+      if (dir.endsWith("-rules")) {
+        continue;
+      }
+      await this.setupWatcherForDirectory(dir);
+    }
+  }
   getDefaultAgentProfileId() {
     for (const defaultProfile of DEFAULT_AGENT_PROFILES) {
       if (this.profiles.has(defaultProfile.id)) {
@@ -9037,7 +9203,8 @@ const InitProjectRulesFileSchema = zod.z.object({
 const CreateNewTaskSchema = zod.z.object({
   projectDir: zod.z.string().min(1, "Project directory is required"),
   parentId: zod.z.string().nullable().optional(),
-  name: zod.z.string().optional()
+  name: zod.z.string().optional(),
+  activate: zod.z.boolean().optional()
 });
 const UpdateTaskSchema = zod.z.object({
   projectDir: zod.z.string().min(1, "Project directory is required"),
@@ -9335,8 +9502,8 @@ class ProjectApi extends BaseApi {
         if (!parsed) {
           return;
         }
-        const { projectDir, parentId, name } = parsed;
-        const params = { parentId, name };
+        const { projectDir, parentId, name, activate } = parsed;
+        const params = { parentId, name, activate };
         const task = await this.eventsHandler.createNewTask(projectDir, params);
         res.status(200).json(task);
       })
@@ -11402,10 +11569,11 @@ class ShellCommandError extends Error {
 }
 const execAsync$1 = util.promisify(child_process.exec);
 class CustomCommandManager {
-  constructor(project, eventManager, extensionManager) {
+  constructor(project, eventManager, extensionManager, store) {
     this.project = project;
     this.eventManager = eventManager;
     this.extensionManager = extensionManager;
+    this.store = store;
   }
   commands = /* @__PURE__ */ new Map();
   watchers = [];
@@ -11445,7 +11613,7 @@ class CustomCommandManager {
     }
     const watcher = chokidar.watch(commandsDir, {
       persistent: true,
-      usePolling: true,
+      usePolling: shouldUsePolling(commandsDir, this.store.getSettings().fileWatchMode),
       ignoreInitial: true
     });
     watcher.on("add", async () => {
@@ -11503,7 +11671,7 @@ class CustomCommandManager {
       const args = Array.isArray(parsed.arguments) ? parsed.arguments : [];
       const template = parsed.__content?.trim() || "";
       const includeContext = typeof parsed.includeContext === "boolean" ? parsed.includeContext : true;
-      const autoApprove = typeof parsed.autoApprove === "boolean" ? parsed.autoApprove : void 0;
+      const autonomyMode = typeof parsed.autonomyMode === "string" && ["manual", "guided", "autonomous"].includes(parsed.autonomyMode) ? parsed.autonomyMode : void 0;
       const skills = typeof parsed.skills === "string" && parsed.skills.trim() ? parsed.skills.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
       commands.set(name, {
         name,
@@ -11511,7 +11679,7 @@ class CustomCommandManager {
         arguments: args,
         template,
         includeContext,
-        autoApprove,
+        autonomyMode,
         skills
       });
     } catch (err) {
@@ -11644,6 +11812,14 @@ class CustomCommandManager {
     this.watchers.forEach((watcher) => watcher.close());
     this.watchers = [];
   }
+  async settingsChanged(oldSettings, newSettings) {
+    if (oldSettings.fileWatchMode === newSettings.fileWatchMode) {
+      return;
+    }
+    this.watchers.forEach((watcher) => watcher.close());
+    this.watchers = [];
+    await this.setupFileWatchers();
+  }
 }
 const migrateContextMessage = (message) => {
   if (Array.isArray(message.content)) {
@@ -11778,7 +11954,8 @@ class ContextManager {
         id: uuid.v4(),
         role: roleOrMessage,
         content: content || "",
-        usageReport
+        usageReport,
+        timestamp: Date.now()
       };
     } else {
       message = roleOrMessage;
@@ -12444,7 +12621,8 @@ ${JSON.stringify(part.output.value)}`
                 commitMessage: response.commitMessage,
                 diff: response.diff,
                 usageReport: response.usageReport,
-                promptContext: message.promptContext
+                promptContext: message.promptContext,
+                timestamp: message.timestamp
               };
               messagesData.push(responseCompletedData);
             });
@@ -12483,7 +12661,8 @@ ${JSON.stringify(part.output.value)}`
                       baseDir: this.task.getProjectDir(),
                       taskId: this.taskId,
                       usageReport: subMessage.usageReport,
-                      promptContext: subMessage.promptContext
+                      promptContext: subMessage.promptContext,
+                      timestamp: subMessage.timestamp
                     };
                     messagesData.push(responseCompletedData);
                   }
@@ -12499,7 +12678,8 @@ ${JSON.stringify(part.output.value)}`
                         toolName: subToolName,
                         args: subPart.input,
                         usageReport: void 0,
-                        promptContext: subMessage.promptContext
+                        promptContext: subMessage.promptContext,
+                        timestamp: subMessage.timestamp
                       };
                       messagesData.push(toolData);
                     }
@@ -12513,7 +12693,8 @@ ${JSON.stringify(part.output.value)}`
                     baseDir: this.task.getProjectDir(),
                     taskId: this.taskId,
                     usageReport: subMessage.usageReport,
-                    promptContext: subMessage.promptContext
+                    promptContext: subMessage.promptContext,
+                    timestamp: subMessage.timestamp
                   };
                   messagesData.push(responseCompletedData);
                 }
@@ -12556,7 +12737,8 @@ ${JSON.stringify(part.output.value)}`
               commitMessage: message.commitMessage,
               diff: message.diff,
               usageReport: message.usageReport,
-              promptContext: message.promptContext
+              promptContext: message.promptContext,
+              timestamp: message.timestamp
             };
             messagesData.push(responseCompletedData);
             reasoning = "";
@@ -12585,7 +12767,8 @@ ${JSON.stringify(part.output.value)}`
                 toolName,
                 args: toolCall.input,
                 usageReport: message.usageReport,
-                promptContext: message.promptContext
+                promptContext: message.promptContext,
+                timestamp: message.timestamp
               };
               messagesData.push(toolData);
             } else if (part.type === "tool-result") {
@@ -12619,7 +12802,8 @@ ${JSON.stringify(part.output.value)}`
             taskId: this.taskId,
             reflectedMessage: message.reflectedMessage,
             usageReport: message.usageReport,
-            promptContext: message.promptContext
+            promptContext: message.promptContext,
+            timestamp: message.timestamp
           };
           messagesData.push(responseCompletedData);
         }
@@ -12637,7 +12821,8 @@ ${JSON.stringify(part.output.value)}`
           taskId: this.taskId,
           content,
           images: images && images.length > 0 ? images : void 0,
-          promptContext: message.promptContext
+          promptContext: message.promptContext,
+          timestamp: message.timestamp
         };
         messagesData.push(userMessageData);
       } else if (message.role === "tool" && Array.isArray(message.content)) {
@@ -13395,7 +13580,16 @@ class SkillManager {
       loadSkillsFromDir(projectSkillsDir, "project"),
       loadSkillsFromDir(AIDER_DESK_BUILTIN_SKILLS_DIR, "builtin")
     ]);
-    return [...projectSkills, ...globalSkills, ...builtinSkills, ...extensionSkills];
+    const allSkills = [...extensionSkills, ...projectSkills, ...globalSkills, ...builtinSkills];
+    const seen = /* @__PURE__ */ new Set();
+    const deduped = [];
+    for (const skill of allSkills) {
+      if (!seen.has(skill.name)) {
+        seen.add(skill.name);
+        deduped.push(skill);
+      }
+    }
+    return deduped;
   }
   async getSkills(contextMessages) {
     const skills = await this.loadAllSkills();
@@ -15327,10 +15521,9 @@ const getProtectedStartIndex = (messages, protectedMessageCount) => {
   return Math.max(0, messages.length - protectedMessageCount);
 };
 const mergeConsecutiveAssistantMessages = (messages) => {
-  const result = cloneMessages(messages);
-  for (let i = result.length - 2; i >= 0; i--) {
-    const current = result[i];
-    const next = result[i + 1];
+  for (let i = messages.length - 2; i >= 0; i--) {
+    const current = messages[i];
+    const next = messages[i + 1];
     if (current.role !== "assistant" || next.role !== "assistant") {
       continue;
     }
@@ -15343,35 +15536,77 @@ const mergeConsecutiveAssistantMessages = (messages) => {
     const nextTextParts = Array.isArray(next.content) ? next.content.filter((p) => p.type === "text") : [];
     const mergedText = [...currentTextParts, ...nextTextParts].map((p) => p.text).filter(Boolean).join("\n\n");
     current.content = mergedText ? [{ type: "text", text: mergedText }] : [];
-    result.splice(i + 1, 1);
+    messages.splice(i + 1, 1);
   }
-  return result.filter((msg) => {
+  return messages.filter((msg) => {
     if (msg.role === "assistant" && Array.isArray(msg.content) && msg.content.length === 0) {
       return false;
     }
     return true;
   });
 };
-const smartCompactMessages = (messages, protectedMessageCount = 10) => {
+const truncateNonPowerToolResults = async (messages, protectedMessageCount = 10) => {
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
+  for (let i = 0; i < protectedStart; i++) {
+    const msg = messages[i];
+    if (msg.role !== "tool") {
+      continue;
+    }
+    for (let j = 0; j < msg.content.length; j++) {
+      const part = msg.content[j];
+      if (part.type !== "tool-result") {
+        continue;
+      }
+      const [serverName] = extractServerNameToolName(part.toolName);
+      if (isPowerTool(serverName)) {
+        continue;
+      }
+      if (part.output.type !== "text" && part.output.type !== "error-text") {
+        continue;
+      }
+      const outputText = part.output.value;
+      if (!outputText) {
+        continue;
+      }
+      const truncated = await truncateToolResult(
+        outputText,
+        20,
+        2,
+        2e3,
+        false,
+        "Output truncated due to compaction, re-execute the tool if full output is needed."
+      );
+      if (truncated !== outputText) {
+        part.output = {
+          type: part.output.type,
+          value: truncated
+        };
+      }
+    }
+  }
+  return messages;
+};
+const smartCompactMessages = async (messages, protectedMessageCount = 10) => {
   let result = cloneMessages(messages);
   result = removeErroredTools(result, protectedMessageCount);
   result = collapseFileEdits(result, protectedMessageCount);
   result = removeStaleFileReads(result, protectedMessageCount);
+  result = compactFileReads(result, protectedMessageCount);
   result = removeObsoleteSearches(result, protectedMessageCount);
   result = compactSemanticSearches(result, protectedMessageCount);
   result = deduplicateBash(result, protectedMessageCount);
   result = redactFetchOutputs(result, protectedMessageCount);
+  result = await truncateNonPowerToolResults(result, protectedMessageCount);
   result = mergeConsecutiveAssistantMessages(result);
   return result;
 };
 const removeErroredTools = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   for (let i = protectedStart - 1; i >= 0; i--) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       continue;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15381,22 +15616,21 @@ const removeErroredTools = (messages, protectedMessageCount = 10) => {
         continue;
       }
       if (isErrorResult(info.output) || isNoOpResult(info.output)) {
-        removeToolCallFromAssistant(result, info.toolCallId);
-        removeToolResult(result, info.toolCallId);
+        removeToolCallFromAssistant(messages, info.toolCallId);
+        removeToolResult(messages, info.toolCallId);
       }
     }
   }
-  return result;
+  return messages;
 };
 const collapseFileEdits = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   const fileEditGroups = /* @__PURE__ */ new Map();
   for (let i = 0; i < protectedStart; i++) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       break;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15411,7 +15645,7 @@ const collapseFileEdits = (messages, protectedMessageCount = 10) => {
       if (toolName !== POWER_TOOL_FILE_EDIT && toolName !== POWER_TOOL_FILE_WRITE) {
         continue;
       }
-      const callInfo = findAssistantToolCall(result, part.toolCallId);
+      const callInfo = findAssistantToolCall(messages, part.toolCallId);
       if (!callInfo) {
         continue;
       }
@@ -15443,22 +15677,21 @@ const collapseFileEdits = (messages, protectedMessageCount = 10) => {
         }
       ]
     };
-    const assistantIndex = result.findIndex((m) => m.id === lastEdit.assistantMessageId);
+    const assistantIndex = messages.findIndex((m) => m.id === lastEdit.assistantMessageId);
     const insertIndex = assistantIndex !== -1 ? assistantIndex + 1 : 0;
-    result.splice(insertIndex, 0, syntheticMessage);
+    messages.splice(insertIndex, 0, syntheticMessage);
     for (const edit of edits) {
-      removeToolCallFromAssistant(result, edit.toolCallId);
-      removeToolResult(result, edit.toolCallId);
+      removeToolCallFromAssistant(messages, edit.toolCallId);
+      removeToolResult(messages, edit.toolCallId);
     }
   }
-  return result;
+  return messages;
 };
 const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   const editedFilePaths = /* @__PURE__ */ new Set();
-  for (let i = 0; i < result.length; i++) {
-    const msg = result[i];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
     if (msg.role === "assistant" && Array.isArray(msg.content)) {
       for (const part of msg.content) {
         if (part.type === "text") {
@@ -15484,7 +15717,7 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
       if (toolName !== POWER_TOOL_FILE_EDIT && toolName !== POWER_TOOL_FILE_WRITE) {
         continue;
       }
-      const callInfo = findAssistantToolCall(result, part.toolCallId);
+      const callInfo = findAssistantToolCall(messages, part.toolCallId);
       if (callInfo) {
         const filePath = extractFilePath(callInfo.input);
         if (filePath) {
@@ -15494,8 +15727,8 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
     }
   }
   const protectedReadFilePaths = /* @__PURE__ */ new Set();
-  for (let i = protectedStart; i < result.length; i++) {
-    const msg = result[i];
+  for (let i = protectedStart; i < messages.length; i++) {
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15507,7 +15740,7 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
       if (!isPowerTool(serverName) || toolName !== POWER_TOOL_FILE_READ) {
         continue;
       }
-      const callInfo = findAssistantToolCall(result, part.toolCallId);
+      const callInfo = findAssistantToolCall(messages, part.toolCallId);
       if (callInfo) {
         const filePath = extractFilePath(callInfo.input);
         if (filePath) {
@@ -15518,10 +15751,10 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
   }
   const readFileGroups = /* @__PURE__ */ new Map();
   for (let i = protectedStart - 1; i >= 0; i--) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       continue;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15533,7 +15766,7 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
       if (!isPowerTool(serverName) || toolName !== POWER_TOOL_FILE_READ) {
         continue;
       }
-      const callInfo = findAssistantToolCall(result, part.toolCallId);
+      const callInfo = findAssistantToolCall(messages, part.toolCallId);
       if (!callInfo) {
         continue;
       }
@@ -15542,8 +15775,8 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
         continue;
       }
       if (editedFilePaths.has(filePath) || protectedReadFilePaths.has(filePath)) {
-        removeToolCallFromAssistant(result, part.toolCallId);
-        removeToolResult(result, part.toolCallId);
+        removeToolCallFromAssistant(messages, part.toolCallId);
+        removeToolResult(messages, part.toolCallId);
         continue;
       }
       if (!readFileGroups.has(filePath)) {
@@ -15561,18 +15794,50 @@ const removeStaleFileReads = (messages, protectedMessageCount = 10) => {
     }
     const toRemove = reads.slice(0, -1);
     for (const read of toRemove) {
-      removeToolCallFromAssistant(result, read.toolCallId);
-      removeToolResult(result, read.toolCallId);
+      removeToolCallFromAssistant(messages, read.toolCallId);
+      removeToolResult(messages, read.toolCallId);
     }
   }
-  return result;
+  return messages;
+};
+const compactFileReads = (messages, protectedMessageCount = 10) => {
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
+  for (let i = 0; i < protectedStart; i++) {
+    if (i >= messages.length) {
+      break;
+    }
+    const msg = messages[i];
+    if (msg.role !== "tool") {
+      continue;
+    }
+    for (let j = 0; j < msg.content.length; j++) {
+      const part = msg.content[j];
+      if (part.type !== "tool-result") {
+        continue;
+      }
+      const [serverName, toolName] = extractServerNameToolName(part.toolName);
+      if (!isPowerTool(serverName) || toolName !== POWER_TOOL_FILE_READ) {
+        continue;
+      }
+      if (part.output.type !== "text") {
+        continue;
+      }
+      const lines = part.output.value.split("\n");
+      if (lines.length > 50) {
+        part.output = {
+          type: "text",
+          value: lines.slice(0, 50).join("\n") + "\n<truncated due to compaction, read the file again if full content is needed>"
+        };
+      }
+    }
+  }
+  return messages;
 };
 const removeObsoleteSearches = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   const fileModificationPositions = [];
-  for (let i = 0; i < result.length; i++) {
-    const msg = result[i];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
     if (msg.role === "assistant" && Array.isArray(msg.content)) {
       for (const part of msg.content) {
         if (part.type === "text" && part.text.includes("<file-edited")) {
@@ -15600,13 +15865,13 @@ const removeObsoleteSearches = (messages, protectedMessageCount = 10) => {
   }
   const hasFileModifications = fileModificationPositions.length > 0;
   if (!hasFileModifications) {
-    return result;
+    return messages;
   }
   for (let i = protectedStart - 1; i >= 0; i--) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       continue;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15623,22 +15888,21 @@ const removeObsoleteSearches = (messages, protectedMessageCount = 10) => {
       }
       const hasLaterModification = fileModificationPositions.some((pos) => pos > i);
       if (hasLaterModification) {
-        removeToolCallFromAssistant(result, part.toolCallId);
-        removeToolResult(result, part.toolCallId);
+        removeToolCallFromAssistant(messages, part.toolCallId);
+        removeToolResult(messages, part.toolCallId);
       }
     }
   }
-  return result;
+  return messages;
 };
 const compactSemanticSearches = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   const searchIndices = [];
   for (let i = 0; i < protectedStart; i++) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       break;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15655,17 +15919,17 @@ const compactSemanticSearches = (messages, protectedMessageCount = 10) => {
     }
   }
   if (searchIndices.length <= 1) {
-    return result;
+    return messages;
   }
   const toRemove = searchIndices.slice(0, -1);
   const toKeep = searchIndices[searchIndices.length - 1];
   for (const search2 of toRemove) {
-    removeToolCallFromAssistant(result, search2.toolCallId);
-    removeToolResult(result, search2.toolCallId);
+    removeToolCallFromAssistant(messages, search2.toolCallId);
+    removeToolResult(messages, search2.toolCallId);
   }
-  const keptToolIdx = result.findIndex((m) => m.role === "tool" && m.content.some((p) => p.type === "tool-result" && p.toolCallId === toKeep.toolCallId));
+  const keptToolIdx = messages.findIndex((m) => m.role === "tool" && m.content.some((p) => p.type === "tool-result" && p.toolCallId === toKeep.toolCallId));
   if (keptToolIdx !== -1) {
-    const keptMsg = result[keptToolIdx];
+    const keptMsg = messages[keptToolIdx];
     const keptPartIdx = keptMsg.content.findIndex((p) => p.type === "tool-result" && p.toolCallId === toKeep.toolCallId);
     const keptPart = keptMsg.content[keptPartIdx];
     if (keptPart && keptPart.output.type === "text") {
@@ -15678,14 +15942,13 @@ const compactSemanticSearches = (messages, protectedMessageCount = 10) => {
       }
     }
   }
-  return result;
+  return messages;
 };
 const deduplicateBash = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   const bashCommands = /* @__PURE__ */ new Map();
   for (let i = 0; i < protectedStart; i++) {
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15697,7 +15960,7 @@ const deduplicateBash = (messages, protectedMessageCount = 10) => {
       if (!isPowerTool(serverName) || toolName !== POWER_TOOL_BASH) {
         continue;
       }
-      const callInfo = findAssistantToolCall(result, part.toolCallId);
+      const callInfo = findAssistantToolCall(messages, part.toolCallId);
       if (!callInfo) {
         continue;
       }
@@ -15720,15 +15983,15 @@ const deduplicateBash = (messages, protectedMessageCount = 10) => {
     }
     const toRemove = occurrences.slice(0, -1);
     for (const occ of toRemove) {
-      removeToolCallFromAssistant(result, occ.toolCallId);
-      removeToolResult(result, occ.toolCallId);
+      removeToolCallFromAssistant(messages, occ.toolCallId);
+      removeToolResult(messages, occ.toolCallId);
     }
   }
   for (let i = 0; i < protectedStart; i++) {
-    if (i >= result.length) {
+    if (i >= messages.length) {
       break;
     }
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15770,13 +16033,12 @@ const deduplicateBash = (messages, protectedMessageCount = 10) => {
       }
     }
   }
-  return result;
+  return messages;
 };
 const redactFetchOutputs = (messages, protectedMessageCount = 10) => {
-  const result = cloneMessages(messages);
-  const protectedStart = getProtectedStartIndex(result, protectedMessageCount);
+  const protectedStart = getProtectedStartIndex(messages, protectedMessageCount);
   for (let i = 0; i < protectedStart; i++) {
-    const msg = result[i];
+    const msg = messages[i];
     if (msg.role !== "tool") {
       continue;
     }
@@ -15798,7 +16060,7 @@ const redactFetchOutputs = (messages, protectedMessageCount = 10) => {
       }
     }
   }
-  return result;
+  return messages;
 };
 const INTERNAL_TASK_ID = "internal";
 const RESPONSE_CHUNK_FLUSH_INTERVAL_MS = 10;
@@ -16375,7 +16637,8 @@ class Task {
       id: promptContext.id,
       role: MessageRole.User,
       content: prompt,
-      promptContext
+      promptContext,
+      timestamp: Date.now()
     });
     this.addUserMessage(promptContext.id, prompt);
     await this.saveTask({
@@ -16408,7 +16671,8 @@ class Task {
       id: promptContext.id,
       role: MessageRole.User,
       content: prompt,
-      promptContext
+      promptContext,
+      timestamp: Date.now()
     });
     let messages = this.contextManager.toConnectorMessages();
     let files = this.contextManager.getContextFiles();
@@ -16427,8 +16691,9 @@ class Task {
     promptContext = extensionResult.promptContext;
     messages = extensionResult.messages;
     files = extensionResult.files;
+    const effectiveAutonomyMode = extensionResult.autonomyMode ?? this.task.autonomyMode ?? DEFAULT_AUTONOMY_MODE;
     let responses = await this.sendPromptToAider(prompt, promptContext, mode, messages, files, {
-      autoApprove: extensionResult.autoApprove ?? this.task.autoApprove,
+      autoApprove: effectiveAutonomyMode === AutonomyMode.Autonomous,
       denyCommands: extensionResult.denyCommands
     });
     logger.debug("Responses:", { responses });
@@ -16813,7 +17078,8 @@ ${contentText}</agent-response>`;
         diff: message.diff,
         usageReport,
         sequenceNumber: message.sequenceNumber,
-        promptContext: message.promptContext
+        promptContext: message.promptContext,
+        timestamp: Date.now()
       };
       const extensionResult = await this.extensionManager.dispatchEvent("onResponseCompleted", { response: data }, this.project, this);
       data = extensionResult.response;
@@ -16880,14 +17146,20 @@ ${contentText}</agent-response>`;
     if (!determinedAnswer) {
       determinedAnswer = normalizedAnswer === "a" || normalizedAnswer === "y" ? "y" : "n";
     }
-    if ((normalizedAnswer === "d" || normalizedAnswer === "a") && (determinedAnswer == "y" || determinedAnswer == "n")) {
-      logger.debug('Storing answer for question due to "d" or "a" input:', {
+    if (normalizedAnswer === "a") {
+      logger.debug('Storing answer for question due to "a" (Always) input:', {
         baseDir: this.project.baseDir,
         questionKey: this.getQuestionKey(this.currentQuestion),
-        rawInput: answer,
-        determinedAndStoredAnswer: determinedAnswer
+        rawInput: answer
       });
-      this.storedQuestionAnswers.set(this.getQuestionKey(this.currentQuestion), determinedAnswer);
+      this.storedQuestionAnswers.set(this.getQuestionKey(this.currentQuestion), "y");
+    } else if (normalizedAnswer === "d") {
+      logger.debug(`Storing answer for question due to "d" (Don't ask again) input:`, {
+        baseDir: this.project.baseDir,
+        questionKey: this.getQuestionKey(this.currentQuestion),
+        rawInput: answer
+      });
+      this.storedQuestionAnswers.set(this.getQuestionKey(this.currentQuestion), "n");
     }
     const questionToAnswer = this.currentQuestion;
     if (!this.currentQuestion.internal) {
@@ -17050,11 +17322,21 @@ ${contentText}</agent-response>`;
     void this.updateContextInfo(true, true);
   }
   async askQuestion(questionData, awaitAnswer = true) {
-    const extensionResult = await this.extensionManager.dispatchEvent("onQuestionAsked", { question: questionData }, this.project, this);
+    let storedAnswer = this.storedQuestionAnswers.get(this.getQuestionKey(questionData));
+    const extensionResult = await this.extensionManager.dispatchEvent(
+      "onQuestionAsked",
+      {
+        question: questionData,
+        storedAnswer
+      },
+      this.project,
+      this
+    );
     if (extensionResult.answer) {
       logger.info("Question answered by extension", {
         question: questionData.text,
-        answer: extensionResult.answer
+        answer: extensionResult.answer,
+        storedAnswer
       });
       return [extensionResult.answer, void 0];
     }
@@ -17064,7 +17346,7 @@ ${contentText}</agent-response>`;
         this.currentQuestionResolves.push(resolve);
       });
     }
-    const storedAnswer = this.storedQuestionAnswers.get(this.getQuestionKey(questionData));
+    storedAnswer = this.storedQuestionAnswers.get(this.getQuestionKey(questionData));
     if (questionData.isGroupQuestion && !questionData.answers) {
       questionData.answers = [
         { text: "(Y)es", shortkey: "y" },
@@ -17405,7 +17687,8 @@ ${contentText}</agent-response>`;
       message,
       finished,
       promptContext,
-      actionIds
+      actionIds,
+      timestamp: Date.now()
     };
     this.eventManager.sendLog(data);
   }
@@ -17757,7 +18040,8 @@ ${contentText}</agent-response>`;
       response,
       usageReport,
       promptContext,
-      finished
+      finished,
+      timestamp: Date.now()
     };
     if (response && usageReport && saveToDb) {
       this.dataManager.saveMessage(id, "tool", this.project.baseDir, usageReport.model, usageReport, {
@@ -17798,7 +18082,8 @@ ${contentText}</agent-response>`;
       taskId: this.taskId,
       content,
       images,
-      promptContext
+      promptContext,
+      timestamp: Date.now()
     };
     this.eventManager.sendUserMessage(data);
   }
@@ -17958,7 +18243,7 @@ ${contentText}</agent-response>`;
       return [];
     }
     await this.contextManager.backupContext();
-    const compactedMessages = smartCompactMessages(contextMessages);
+    const compactedMessages = await smartCompactMessages(contextMessages);
     this.contextManager.setContextMessages(compactedMessages);
     await this.contextManager.loadMessages(compactedMessages, false);
     await this.updateContextInfo();
@@ -18121,7 +18406,7 @@ ${contentText}</agent-response>`;
     const newTaskData = await this.project.createNewTask({
       parentId: this.task.parentId || this.taskId,
       sendEvent: false,
-      autoApprove: execute ? this.task.autoApprove : void 0,
+      autonomyMode: execute ? this.task.autonomyMode : void 0,
       activate: true
     });
     const newTask = this.project.getTask(newTaskData.id);
@@ -18441,7 +18726,12 @@ ${error.stderr}`,
             }
           }
         }
-        const systemPrompt = await this.promptsManager.getSystemPrompt(this.store.getSettings(), this, profile, command.autoApprove ?? this.task.autoApprove);
+        const systemPrompt = await this.promptsManager.getSystemPrompt(
+          this.store.getSettings(),
+          this,
+          profile,
+          command.autonomyMode ?? this.task.autonomyMode ?? DEFAULT_AUTONOMY_MODE
+        );
         const messages = command.includeContext === false ? [] : void 0;
         const contextFiles = command.includeContext === false ? [] : void 0;
         this.addLogMessage("loading", "Executing custom command...");
@@ -19192,7 +19482,7 @@ ${diff}
     const newTaskData = await this.project.createNewTask({
       name: taskName,
       sendEvent: false,
-      autoApprove: true,
+      autonomyMode: AutonomyMode.Autonomous,
       activate: true,
       mode,
       parentId: this.task.parentId || this.taskId,
@@ -19332,7 +19622,7 @@ class Project {
     this.promptsManager = promptsManager;
     this.extensionManager = extensionManager;
     this.pythonInstaller = pythonInstaller;
-    this.customCommandManager = new CustomCommandManager(this, this.eventManager, this.extensionManager);
+    this.customCommandManager = new CustomCommandManager(this, this.eventManager, this.extensionManager, this.store);
     this.tasksLoadingPromise = this.loadTasks();
   }
   customCommandManager;
@@ -19408,9 +19698,7 @@ class Project {
         ...normalizedParams
       };
     }
-    const projectSettings = this.getProjectSettings();
     const taskData = {
-      autoApprove: projectSettings.autoApproveLocked ? true : initialTaskData.autoApprove,
       ...initialTaskData
     };
     const extResult = await this.extensionManager.dispatchEvent("onTaskCreated", { task: taskData }, this);
@@ -19712,6 +20000,7 @@ class Project {
     this.forEachTask((task) => {
       void task.settingsChanged(oldSettings, newSettings);
     });
+    void this.customCommandManager.settingsChanged(oldSettings, newSettings);
   }
   async projectSettingsChanged(oldSettings, newSettings) {
     this.forEachTask((task) => {
@@ -19961,7 +20250,8 @@ class EventManager {
       baseDir,
       taskId,
       command,
-      output
+      output,
+      timestamp: Date.now()
     };
     this.sendToWindows("command-output", data);
     this.broadcastToEventConnectors("command-output", data);
@@ -22570,6 +22860,117 @@ const mistralProviderStrategy = {
   getAiderMapping: getMistralAiderMapping,
   getModelInfo: getDefaultModelInfo
 };
+const NEURALWATT_BASE_URL = "https://api.neuralwatt.com/v1";
+const loadNeuralwattModels = async (profile, settings) => {
+  if (!isNeuralwattProvider(profile.provider)) {
+    return { models: [], success: false };
+  }
+  const provider = profile.provider;
+  const apiKey = provider.apiKey || "";
+  const apiKeyEnv = getEffectiveEnvironmentVariable("NEURALWATT_API_KEY", settings);
+  const effectiveApiKey = apiKey || apiKeyEnv?.value || "";
+  if (!effectiveApiKey) {
+    logger.debug("Neuralwatt API key is required. Please set it in Providers settings or via NEURALWATT_API_KEY environment variable.");
+    return { models: [], success: false };
+  }
+  try {
+    const response = await fetch(`${NEURALWATT_BASE_URL}/models`, {
+      headers: { Authorization: `Bearer ${effectiveApiKey}` }
+    });
+    if (!response.ok) {
+      const errorMsg = `Neuralwatt 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();
+    logger.info(`Received response from Neuralwatt models API for profile ${profile.id}`, { data });
+    const models = data.data?.map((model) => {
+      const metadata = model.metadata;
+      const pricing = metadata?.pricing;
+      const limits = metadata?.limits;
+      const capabilities = metadata?.capabilities;
+      return {
+        id: model.id,
+        providerId: profile.id,
+        maxInputTokens: limits?.max_context_length ?? model.max_model_len,
+        maxOutputTokensLimit: limits?.max_output_tokens ?? void 0,
+        inputCostPerToken: pricing ? pricing.input_per_million / 1e6 : void 0,
+        outputCostPerToken: pricing ? pricing.output_per_million / 1e6 : void 0,
+        cacheReadInputTokenCost: pricing?.cached_input_per_million != null ? pricing.cached_input_per_million / 1e6 : void 0,
+        supportsTools: capabilities?.tools
+      };
+    }) || [];
+    logger.info(`Loaded ${models.length} Neuralwatt 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 Neuralwatt models";
+    logger.error("Error loading Neuralwatt models:", error);
+    return { models: [], success: false, error: errorMsg };
+  }
+};
+const hasNeuralwattEnvVars = (settings) => {
+  return !!getEffectiveEnvironmentVariable("NEURALWATT_API_KEY", settings, void 0)?.value;
+};
+const getNeuralwattAiderMapping = (provider, modelId) => {
+  const neuralwattProvider = provider.provider;
+  const envVars = {};
+  if (neuralwattProvider.apiKey) {
+    envVars.OPENAI_API_KEY = neuralwattProvider.apiKey;
+  }
+  envVars.OPENAI_API_BASE = NEURALWATT_BASE_URL;
+  return {
+    modelName: `openai/${modelId}`,
+    environmentVariables: envVars
+  };
+};
+const createNeuralwattLlm = (profile, model, settings, projectDir) => {
+  const provider = profile.provider;
+  let apiKey = provider.apiKey;
+  if (!apiKey) {
+    const effectiveVar = getEffectiveEnvironmentVariable("NEURALWATT_API_KEY", settings, projectDir);
+    if (effectiveVar) {
+      apiKey = effectiveVar.value;
+      logger.debug(`Loaded NEURALWATT_API_KEY from ${effectiveVar.source}`);
+    }
+  }
+  if (!apiKey) {
+    throw new Error("Neuralwatt API key is required in Providers settings or Aider environment variables (NEURALWATT_API_KEY)");
+  }
+  const compatibleProvider = openaiCompatible.createOpenAICompatible({
+    name: "neuralwatt",
+    apiKey,
+    baseURL: NEURALWATT_BASE_URL,
+    headers: profile.headers
+  });
+  return compatibleProvider(model.id);
+};
+const getNeuralwattUsageReport = (task, provider, model, usage, providerMetadata) => {
+  const totalSentTokens = usage.inputTokens || 0;
+  const receivedTokens = usage.outputTokens || 0;
+  const cacheReadTokens = usage.cachedInputTokens || 0;
+  const sentTokens = totalSentTokens - cacheReadTokens;
+  logger.info("Neuralwatt usage report", {
+    providerMetadata,
+    usage
+  });
+  const messageCost = calculateCost(model, sentTokens, receivedTokens, cacheReadTokens);
+  return {
+    model: `${provider.id}/${model.id}`,
+    sentTokens,
+    receivedTokens,
+    cacheReadTokens,
+    messageCost,
+    agentTotalCost: task.task.agentTotalCost + messageCost
+  };
+};
+const neuralwattProviderStrategy = {
+  createLlm: createNeuralwattLlm,
+  getUsageReport: getNeuralwattUsageReport,
+  loadModels: loadNeuralwattModels,
+  hasEnvVars: hasNeuralwattEnvVars,
+  getAiderMapping: getNeuralwattAiderMapping,
+  getModelInfo: getDefaultModelInfo
+};
 const loadOllamaModels = async (profile, settings) => {
   if (!isOllamaProvider(profile.provider)) {
     return { models: [], success: false };
@@ -23933,6 +24334,7 @@ class ModelManager {
     lmstudio: lmStudioProviderStrategy,
     minimax: minimaxProviderStrategy,
     mistral: mistralProviderStrategy,
+    neuralwatt: neuralwattProviderStrategy,
     ollama: ollamaProviderStrategy,
     openai: openaiProviderStrategy,
     "openai-compatible": openaiCompatibleProviderStrategy,
@@ -25284,7 +25686,7 @@ class MemoryManager {
               done: this.embeddingProgress.done,
               total: this.embeddingProgress.total,
               finished: true,
-              error: "Failed to load @huggingface/transformers. This is usually a packaging issue with native dependencies (e.g. sharp/libvips)."
+              error: "Failed to load @huggingface/transformers. This is usually a packaging issue with native dependencies."
             };
             logger.error("Failed to load transformers module. Memory embedding will be unavailable.", error);
             return;
@@ -25456,7 +25858,7 @@ class MemoryManager {
           done: this.embeddingProgress.done,
           total: this.embeddingProgress.total,
           finished: true,
-          error: "Failed to load @huggingface/transformers. This is usually a packaging issue with native dependencies (e.g. sharp/libvips)."
+          error: "Failed to load @huggingface/transformers. This is usually a packaging issue with native dependencies."
         };
         logger.error("Failed to load transformers module. Memory embedding will be unavailable.", error);
         return;
@@ -26112,6 +26514,18 @@ class ExtensionContextImpl {
       return [];
     }
   }
+  getProviders() {
+    if (!this.modelManager) {
+      this.log("ModelManager not available, returning empty providers", "warn");
+      return [];
+    }
+    try {
+      return this.modelManager.getProviders();
+    } catch (error) {
+      this.log(`Failed to get providers: ${error}`, "error");
+      return [];
+    }
+  }
   async getSetting(key) {
     if (!this.store) {
       throw new Error("Store not available");
@@ -26202,6 +26616,9 @@ class ExtensionContextImpl {
     }
     return this.memoryManager;
   }
+  async truncateToolResult(content, maxLines, maxSizeKB, maxTokens, saveToFile, truncationSuffix) {
+    return truncateToolResult(content, maxLines, maxSizeKB, maxTokens, saveToFile, truncationSuffix);
+  }
 }
 const CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 class ExtensionFetcher {
@@ -26607,6 +27024,9 @@ class ExtensionManager {
       logger.debug("[Extensions] Repository list changed, refreshing extension cache");
       void this.fetcher.getAvailableExtensions(newRepositories, true);
     }
+    if (oldSettings.fileWatchMode !== newSettings.fileWatchMode) {
+      void this.restartWatchers();
+    }
   }
   addListener(listener) {
     this.listeners.push(listener);
@@ -26911,7 +27331,7 @@ class ExtensionManager {
       };
       const watcher = chokidar.watch(dir, {
         persistent: true,
-        usePolling: true,
+        usePolling: shouldUsePolling(dir, this.store.getSettings().fileWatchMode),
         ignoreInitial: true,
         ignored: (filePath) => {
           const basename = path.basename(filePath);
@@ -26995,6 +27415,25 @@ class ExtensionManager {
       logger.debug(`[Extensions] Stopped watching project extensions: ${projectDir}`);
     }
   }
+  async restartWatchers() {
+    const projectDirs = Array.from(this.projectWatchers.keys());
+    await this.stopGlobalWatcher();
+    for (const dir of projectDirs) {
+      await this.stopProjectWatcher(dir);
+    }
+    await this.startHotReloadWatcher();
+    for (const dir of projectDirs) {
+      const projectExtensionsDir = path.join(dir, AIDER_DESK_EXTENSIONS_DIR);
+      const watcher = await this.setupWatcherForDir(projectExtensionsDir, async () => {
+        logger.debug(`[Extensions] Project extensions changed for ${dir}, reloading...`);
+        await this.unloadExtensionsForDir(projectExtensionsDir);
+        await this.loadExtensionsForDir(projectExtensionsDir);
+      });
+      if (watcher) {
+        this.projectWatchers.set(dir, watcher);
+      }
+    }
+  }
   static TOOL_NAME_REGEX = /^[a-z][a-z0-9_-]*$/;
   validateToolDefinition(tool) {
     const errors = [];
@@ -27913,7 +28352,7 @@ class ExtensionManager {
   }
 }
 class EventsHandler {
-  constructor(projectManager, store, mcpManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, proxyManager, windowManager) {
+  constructor(projectManager, store, mcpManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, proxyManager, promptsManager, windowManager) {
     this.projectManager = projectManager;
     this.store = store;
     this.mcpManager = mcpManager;
@@ -27928,6 +28367,7 @@ class EventsHandler {
     this.memoryManager = memoryManager;
     this.extensionManager = extensionManager;
     this.proxyManager = proxyManager;
+    this.promptsManager = promptsManager;
     this.windowManager = windowManager;
   }
   loadSettings() {
@@ -27941,6 +28381,8 @@ class EventsHandler {
     this.telemetryManager.settingsChanged(oldSettings, newSettings);
     void this.memoryManager.settingsChanged(oldSettings, newSettings);
     this.extensionManager.settingsChanged(oldSettings, newSettings);
+    void this.agentProfileManager.settingsChanged(oldSettings, newSettings);
+    void this.promptsManager.settingsChanged(oldSettings, newSettings);
     this.eventManager.sendSettingsUpdated(newSettings);
     return this.store.getSettings();
   }
@@ -28921,8 +29363,9 @@ const registerAllHelpers = () => {
   registerFormattingHelpers();
 };
 class PromptsManager {
-  constructor(extensionManager, defaultTemplatesDir = AIDER_DESK_DEFAULT_PROMPTS_DIR, globalPromptsDir = AIDER_DESK_GLOBAL_PROMPTS_DIR) {
+  constructor(extensionManager, store, defaultTemplatesDir = AIDER_DESK_DEFAULT_PROMPTS_DIR, globalPromptsDir = AIDER_DESK_GLOBAL_PROMPTS_DIR) {
     this.extensionManager = extensionManager;
+    this.store = store;
     this.defaultTemplatesDir = defaultTemplatesDir;
     this.globalPromptsDir = globalPromptsDir;
     registerAllHelpers();
@@ -29016,7 +29459,7 @@ class PromptsManager {
     }
     const watcher = chokidar.watch(this.globalPromptsDir, {
       persistent: true,
-      usePolling: true,
+      usePolling: shouldUsePolling(this.globalPromptsDir, this.store.getSettings().fileWatchMode),
       ignoreInitial: true
     });
     const debouncedReload = debounce(async () => {
@@ -29041,7 +29484,7 @@ class PromptsManager {
     await this.compileProjectTemplates(projectDir);
     const watcher = chokidar.watch(projectPromptsDir, {
       persistent: true,
-      usePolling: true,
+      usePolling: shouldUsePolling(projectPromptsDir, this.store.getSettings().fileWatchMode),
       ignoreInitial: true
     });
     const debouncedReload = debounce(async () => {
@@ -29070,6 +29513,20 @@ class PromptsManager {
     this.projectTemplatesCache.clear();
     logger.info("PromptsManager disposed");
   }
+  async settingsChanged(oldSettings, newSettings) {
+    if (oldSettings.fileWatchMode === newSettings.fileWatchMode) {
+      return;
+    }
+    const watchedProjects = Array.from(this.watchers.keys()).filter((k) => k !== "global");
+    for (const watcher of this.watchers.values()) {
+      await watcher.close();
+    }
+    this.watchers.clear();
+    await this.setupGlobalWatcher();
+    for (const projectDir of watchedProjects) {
+      await this.watchProject(projectDir);
+    }
+  }
   async render(name, data, projectDir, task) {
     const projectTemplates = this.projectTemplatesCache.get(projectDir);
     const projectTemplate = projectTemplates?.get(name);
@@ -29095,7 +29552,7 @@ class PromptsManager {
     }
     return prompt;
   }
-  calculateToolPermissions = (settings, agentProfile, autoApprove) => {
+  calculateToolPermissions = (settings, agentProfile, autonomyMode) => {
     const { usePowerTools = false, useMemoryTools = false, useSkillsTools = false } = agentProfile;
     const memoryEnabled = settings.memory.enabled && useMemoryTools;
     const isAllowed = (tool) => agentProfile.toolApprovals[tool] !== ToolApprovalState.Never;
@@ -29124,11 +29581,12 @@ class PromptsManager {
       skills: {
         allowed: useSkillsTools && isAllowed(`${SKILLS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SKILLS_TOOL_ACTIVATE_SKILL}`)
       },
-      autoApprove
+      autonomyMode
     };
   };
-  getSystemPrompt = async (settings, task, agentProfile, autoApprove = task.task.autoApprove ?? false, additionalInstructions) => {
-    const toolPermissions = this.calculateToolPermissions(settings, agentProfile, autoApprove);
+  getSystemPrompt = async (settings, task, agentProfile, autonomyMode, additionalInstructions) => {
+    const effectiveAutonomyMode = autonomyMode ?? task.task.autonomyMode ?? DEFAULT_AUTONOMY_MODE;
+    const toolPermissions = this.calculateToolPermissions(settings, agentProfile, effectiveAutonomyMode);
     toolPermissions.powerTools.anyEnabled = Object.values(toolPermissions.powerTools).some((v) => v);
     const rulesFiles = await this.getRulesContent(task, agentProfile);
     const customInstructions = [agentProfile.customInstructions, additionalInstructions].filter(Boolean).join("\n\n").trim();
@@ -29537,12 +29995,12 @@ const initManagers = async (store, windowManager) => {
   extensionManager.init().catch((error) => {
     logger.error("[Extensions] Extension system initialization failed, continuing without extensions:", error);
   });
-  const promptsManager = new PromptsManager(extensionManager);
+  const promptsManager = new PromptsManager(extensionManager, store);
   promptsManager.init().catch((error) => {
     logger.error("[Prompts] Prompts system initialization failed:", error);
   });
   const worktreeManager = new WorktreeManager();
-  const agentProfileManager = new AgentProfileManager(eventManager, extensionManager);
+  const agentProfileManager = new AgentProfileManager(eventManager, extensionManager, store);
   agentProfileManager.init().catch((error) => {
     logger.error("[AgentProfile] Agent profile system initialization failed:", error);
   });
@@ -29579,6 +30037,7 @@ const initManagers = async (store, windowManager) => {
     memoryManager,
     extensionManager,
     proxyManager,
+    promptsManager,
     windowManager
   );
   const serverController = new ServerController(httpServer, projectManager, eventsHandler, store, pythonInstaller);
@@ -30210,7 +30669,8 @@ const DEFAULT_SETTINGS = {
   proxy: {
     enabled: false,
     url: ""
-  }
+  },
+  fileWatchMode: FileWatchMode.Auto
 };
 const compareBaseDirs = (baseDir1, baseDir2) => {
   return normalizeBaseDir(baseDir1) === normalizeBaseDir(baseDir2);