ur-agent 1.65.9 → 1.65.11

package/dist/cli.js

@@ -56962,13 +56962,19 @@ function normalizeQuestionOption(value) {
   const option = objectValue(value);
   if (!option)
     return null;
-  const label = typeof option.label === "string" && option.label.trim() ? option.label.trim() : typeof option.value === "string" && option.value.trim() ? option.value.trim() : "";
-  const description = typeof option.description === "string" && option.description.trim() ? option.description.trim() : label;
-  if (!label || !description)
+  if (!sameKeys(option, ["label"], ["description", "preview"]))
     return null;
+  if (typeof option.label !== "string" || !option.label.trim())
+    return null;
+  if (option.description !== undefined && (typeof option.description !== "string" || !option.description.trim())) {
+    return null;
+  }
+  if (option.preview !== undefined && typeof option.preview !== "string") {
+    return null;
+  }
   return {
-    label,
-    description,
+    label: option.label.trim(),
+    ...typeof option.description === "string" ? { description: option.description.trim() } : {},
     ...typeof option.preview === "string" ? { preview: option.preview } : {}
   };
 }
@@ -56988,10 +56994,14 @@ function normalizeQuestion(value, index2) {
   ]);
   if (!questionText || !Array.isArray(question.options))
     return null;
-  const options = question.options.map(normalizeQuestionOption).filter((option) => option !== null);
-  if (options.length < 2 || options.length > 4)
+  const normalizedOptions = question.options.map(normalizeQuestionOption);
+  if (!normalizedOptions.every((option) => option !== null)) {
     return null;
-  const header = typeof question.header === "string" && question.header.trim() ? question.header.trim().slice(0, 12) : headerFromQuestion(questionText, index2);
+  }
+  const options = normalizedOptions;
+  if (options.length < 2 || options.length > 8)
+    return null;
+  const header = typeof question.header === "string" && question.header.trim() ? question.header.trim() : headerFromQuestion(questionText, index2);
   return {
     question: questionText,
     header,
@@ -57295,135 +57305,7 @@ function synthesizeKimiToolCalls(message) {
   m.content = [...kept, ...synthesized];
   m.stop_reason = "tool_use";
 }
-function clarifyHeader(question) {
-  const word = question.replace(/[^A-Za-z0-9]+/g, " ").split(/\s+/).find((part) => part && !CLARIFY_HEADER_STOP_WORDS.has(part.toLowerCase()));
-  return (word ?? "Options").slice(0, 12);
-}
-function cleanOption(raw) {
-  let opt = raw.trim();
-  opt = opt.replace(/^[\s"'`*_\-\u2013\u2014]+/, "").replace(/[\s"'`*_.?!,;:]+$/g, "");
-  for (let i2 = 0;i2 < 3; i2++) {
-    const before = opt;
-    opt = opt.replace(OPTION_LEADIN_RE, "").replace(OPTION_QUESTION_LEADIN_RE, "");
-    if (opt === before)
-      break;
-  }
-  opt = opt.replace(OPTION_TRAILING_QUALIFIER_RE, "");
-  opt = opt.replace(/\b(?:instead|please|etc\.?)$/i, "");
-  return opt.replace(/[\s,;:]+$/g, "").trim();
-}
-function splitEnumeration(s) {
-  if (!/\bor\b/i.test(s))
-    return null;
-  const parts = s.split(/\s*,?\s+or\s+|\s*,\s*/gi).map((p) => p.trim()).filter(Boolean);
-  return parts.length >= 2 ? parts : null;
-}
-function extractClarifyOptions(text) {
-  const trimmed = text.trim();
-  if (!trimmed)
-    return [];
-  const clauses = trimmed.split(/(?<=[?.!;])\s+/).map((c3) => c3.trim()).filter(Boolean);
-  const options = [];
-  for (const clause of clauses) {
-    const stripped = clause.replace(OPTION_LEADIN_RE, "");
-    const candidates = splitEnumeration(stripped) ?? [stripped];
-    for (const candidate of candidates) {
-      const cleaned = cleanOption(candidate);
-      if (!cleaned || cleaned.length > 120)
-        continue;
-      if (OPTION_CATCHALL_RE.test(cleaned))
-        continue;
-      options.push(cleaned);
-    }
-  }
-  const seen = new Set;
-  const unique = [];
-  for (const opt of options) {
-    const key = opt.toLowerCase();
-    if (seen.has(key))
-      continue;
-    seen.add(key);
-    unique.push(opt);
-    if (unique.length === 4)
-      break;
-  }
-  return unique;
-}
-function buildClarifyQuestion(segment) {
-  const s = segment.replace(/^\s*(?:\d+[.)]|[-*\u2022])\s+/, "").replace(/\*\*/g, "").trim();
-  const qEnd = s.indexOf("?");
-  if (qEnd === -1)
-    return null;
-  const question = s.slice(0, qEnd + 1).trim();
-  const remainder = s.slice(qEnd + 1).trim();
-  let options = extractClarifyOptions(remainder);
-  if (options.length < 2) {
-    const inner = question.replace(/\?+$/, "");
-    const lastClause = (inner.split(/(?<=[.!;])\s+/).pop() ?? inner).trim();
-    if (/\bor\b/i.test(lastClause)) {
-      const inline = extractClarifyOptions(lastClause + ".");
-      if (inline.length >= 2)
-        options = inline;
-    }
-  }
-  if (options.length < 2)
-    return null;
-  return {
-    question,
-    header: clarifyHeader(question),
-    options: options.map((label) => ({ label, description: label }))
-  };
-}
-function parseClarifyingQuestions(text, options = {}) {
-  if (!hasTool(options.availableToolNames, "AskUserQuestion"))
-    return null;
-  const trimmed = text.trim();
-  if (!trimmed || trimmed.length > CLARIFY_MAX_LEN)
-    return null;
-  if (trimmed.includes("```") || trimmed.includes("<|"))
-    return null;
-  const lines = trimmed.split(`
-`).map((l) => l.trim()).filter(Boolean);
-  if (lines.length === 0 || !lines[lines.length - 1].endsWith("?"))
-    return null;
-  const isListItem = (l) => /^(?:\d+[.)]|[-*\u2022])\s+/.test(l);
-  let segments;
-  if (lines.some(isListItem)) {
-    segments = [];
-    for (const line of lines) {
-      if (isListItem(line) || segments.length === 0)
-        segments.push(line);
-      else
-        segments[segments.length - 1] += " " + line;
-    }
-  } else {
-    segments = trimmed.split(/\n{2,}/).map((s) => s.replace(/\n/g, " ").trim()).filter((s) => s.includes("?"));
-    if (segments.length === 0)
-      segments = [trimmed.replace(/\n/g, " ")];
-  }
-  const questions = [];
-  const seenQuestions = new Set;
-  for (const segment of segments) {
-    if (questions.length === 4)
-      break;
-    const built = buildClarifyQuestion(segment);
-    if (!built)
-      continue;
-    const key = built.question.toLowerCase();
-    if (seenQuestions.has(key))
-      continue;
-    seenQuestions.add(key);
-    questions.push(built);
-  }
-  if (questions.length === 0)
-    return null;
-  return {
-    id: `clarify_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
-    name: "AskUserQuestion",
-    input: { questions }
-  };
-}
-var SECTION_RE, CALL_RE, STRAY_RE, KimiToolCallParseError, CLARIFY_MAX_LEN = 2000, OPTION_LEADIN_RE, OPTION_QUESTION_LEADIN_RE, OPTION_CATCHALL_RE, OPTION_TRAILING_QUALIFIER_RE, CLARIFY_HEADER_STOP_WORDS;
+var SECTION_RE, CALL_RE, STRAY_RE, KimiToolCallParseError;
 var init_kimiToolCalls = __esm(() => {
   init_json();
   SECTION_RE = /<\|tool_calls_section_begin\|>([\s\S]*?)<\|tool_calls_section_end\|>/g;
@@ -57436,41 +57318,6 @@ var init_kimiToolCalls = __esm(() => {
       Object.setPrototypeOf(this, new.target.prototype);
     }
   };
-  OPTION_LEADIN_RE = /^(?:and\s+)?(?:or|also|just|maybe|perhaps|either|alternatively|optionally|well)\b[\s,:]*/i;
-  OPTION_QUESTION_LEADIN_RE = /^(?:(?:do|would|should|could|can|will)\s+(?:you|we|i)\s+(?:want|prefer|like|need|use|go\s+with|have)?|you\s+(?:could|can|might|may)|i\s+(?:could|can|would|might)|we\s+(?:could|can|might)|want|prefer|pick|choose|use|go\s+with|how\s+about|what\s+about)\b[\s,:]*/i;
-  OPTION_CATCHALL_RE = /^(?:(?:or\s+)?(?:something|anything|someone)\s+else|other(?:\s+option)?|none(?:\s+of\s+(?:the\s+)?(?:above|these))?|no|nope|not\s+sure|any(?:thing)?|else|you\s+(?:choose|decide|pick)|your\s+(?:call|choice))$/i;
-  OPTION_TRAILING_QUALIFIER_RE = /\s+(?:is|are|would\s+be|seems?|sounds?|looks?)\s+(?:the\s+)?(?:simplest|easiest|best|recommended|fastest|cleanest|most\s+\w+)(?:\s+(?:option|choice|approach))?$/i;
-  CLARIFY_HEADER_STOP_WORDS = new Set([
-    "a",
-    "about",
-    "also",
-    "an",
-    "and",
-    "are",
-    "be",
-    "can",
-    "could",
-    "do",
-    "does",
-    "for",
-    "i",
-    "is",
-    "or",
-    "should",
-    "support",
-    "that",
-    "the",
-    "this",
-    "to",
-    "want",
-    "we",
-    "what",
-    "which",
-    "with",
-    "without",
-    "would",
-    "you"
-  ]);
 });
 
 // src/services/api/ollama.ts
@@ -58115,11 +57962,6 @@ async function* streamURHQEvents(response, params, controller, requestId, textTo
   if (textToolFallbackAllowed) {
     const kimiParsed = parseKimiToolCalls(text);
     textToolCalls.push(...kimiParsed.toolCalls);
-    if (toolCalls.length === 0 && textToolCalls.length === 0) {
-      const clarify = parseClarifyingQuestions(text, { availableToolNames });
-      if (clarify)
-        textToolCalls.push(clarify);
-    }
   }
   const normalizedToolUses = normalizeOllamaToolUses(toolCalls, textToolCalls, availableToolNames, "Ollama stream");
   for (const call of normalizedToolUses) {
@@ -58260,9 +58102,6 @@ function ollamaResponseToURHQMessage(response, params, textToolFallbackAllowed)
   }) : { text: rawText, toolCalls: [] };
   const text = parsedText.text;
   const textToolCalls = [...parsedText.toolCalls];
-  const clarifyCall = textToolFallbackAllowed && structured.length === 0 && textToolCalls.length === 0 ? parseClarifyingQuestions(text, { availableToolNames }) : null;
-  if (clarifyCall)
-    textToolCalls.push(clarifyCall);
   const normalizedToolUses = normalizeOllamaToolUses(structured, textToolCalls, availableToolNames, "Ollama response");
   if (thinking) {
     content.push({
@@ -75597,7 +75436,7 @@ var init_auth = __esm(() => {
 
 // src/utils/userAgent.ts
 function getURCodeUserAgent() {
-  return `ur/${"1.65.9"}`;
+  return `ur/${"1.65.11"}`;
 }
 
 // src/utils/workloadContext.ts
@@ -75619,7 +75458,7 @@ function getUserAgent() {
   const clientApp = process.env.UR_AGENT_SDK_CLIENT_APP ? `, client-app/${process.env.UR_AGENT_SDK_CLIENT_APP}` : "";
   const workload = getWorkload();
   const workloadSuffix = workload ? `, workload/${workload}` : "";
-  return `ur-cli/${"1.65.9"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
+  return `ur-cli/${"1.65.11"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
 }
 function getMCPUserAgent() {
   const parts = [];
@@ -75633,7 +75472,7 @@ function getMCPUserAgent() {
     parts.push(`client-app/${process.env.UR_AGENT_SDK_CLIENT_APP}`);
   }
   const suffix = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-  return `ur/${"1.65.9"}${suffix}`;
+  return `ur/${"1.65.11"}${suffix}`;
 }
 function getWebFetchUserAgent() {
   return `UR-User (${getURCodeUserAgent()})`;
@@ -75771,7 +75610,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "1.65.9",
+      appVersion: "1.65.11",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -83971,7 +83810,7 @@ var init_metadata = __esm(() => {
   COMPOUND_OPERATOR_REGEX = /\s*(?:&&|\|\||[;|])\s*/;
   WHITESPACE_REGEX = /\s+/;
   getVersionBase = memoize_default(() => {
-    const match = "1.65.9".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
+    const match = "1.65.11".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
     return match ? match[0] : undefined;
   });
   buildEnvContext = memoize_default(async () => {
@@ -84011,7 +83850,7 @@ var init_metadata = __esm(() => {
       isGithubAction: isEnvTruthy(process.env.GITHUB_ACTIONS),
       isURCodeAction: isEnvTruthy(process.env.UR_CODE_ACTION),
       isURAiAuth: isURAISubscriber(),
-      version: "1.65.9",
+      version: "1.65.11",
       versionBase: getVersionBase(),
       buildTime: "",
       deploymentEnvironment: env2.detectDeploymentEnvironment(),
@@ -84681,7 +84520,7 @@ function initialize1PEventLogging() {
   const platform2 = getPlatform();
   const attributes = {
     [import_semantic_conventions4.ATTR_SERVICE_NAME]: "ur",
-    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.65.9"
+    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.65.11"
   };
   if (platform2 === "wsl") {
     const wslVersion = getWslVersion();
@@ -84709,7 +84548,7 @@ function initialize1PEventLogging() {
       })
     ]
   });
-  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.65.9");
+  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.65.11");
 }
 async function reinitialize1PEventLoggingIfConfigChanged() {
   if (!is1PEventLoggingEnabled() || !firstPartyEventLoggerProvider) {
@@ -86756,12 +86595,13 @@ function extractMcpToolDisplayName(userFacingName) {
 var init_mcpStringUtils = () => {};
 
 // src/tools/AgentTool/constants.ts
-var AGENT_TOOL_NAME = "Agent", LEGACY_AGENT_TOOL_NAME = "Task", VERIFICATION_AGENT_TYPE = "verification", ONE_SHOT_BUILTIN_AGENT_TYPES;
+var AGENT_TOOL_NAME = "Agent", LEGACY_AGENT_TOOL_NAME = "Task", VERIFICATION_AGENT_TYPE = "verification", READ_ONLY_PLAN_AGENT_TYPES, ONE_SHOT_BUILTIN_AGENT_TYPES;
 var init_constants2 = __esm(() => {
-  ONE_SHOT_BUILTIN_AGENT_TYPES = new Set([
+  READ_ONLY_PLAN_AGENT_TYPES = new Set([
     "Explore",
     "Plan"
   ]);
+  ONE_SHOT_BUILTIN_AGENT_TYPES = READ_ONLY_PLAN_AGENT_TYPES;
 });
 
 // src/tools/TaskOutputTool/constants.ts
@@ -94596,7 +94436,7 @@ function formatAgentTrendReport(report = buildAgentTrendReport()) {
 function formatA2AAgentCard(options = {}, pretty = true) {
   return JSON.stringify(buildA2AAgentCard(options), null, pretty ? 2 : 0);
 }
-var urVersion = "1.65.9", researchSnapshotDate = "2026-07-15", coverage, priorityRoadmap;
+var urVersion = "1.65.11", researchSnapshotDate = "2026-07-15", coverage, priorityRoadmap;
 var init_trends = __esm(() => {
   init_a2aCardSignature();
   coverage = [
@@ -97399,7 +97239,7 @@ function getAttributionHeader(fingerprint) {
   if (!isAttributionHeaderEnabled()) {
     return "";
   }
-  const version2 = `${"1.65.9"}.${fingerprint}`;
+  const version2 = `${"1.65.11"}.${fingerprint}`;
   const entrypoint = process.env.UR_CODE_ENTRYPOINT ?? "unknown";
   const cch = "";
   const workload = getWorkload();
@@ -97920,6 +97760,10 @@ function getWriteToolDescription() {
 
 Usage:
 - This tool will overwrite the existing file if there is one at the provided path.${getPreReadInstruction()}
+- Every call must include both required fields in the same structured invocation: \`file_path\` and the complete literal file text in \`content\`.
+- Put the actual file text inside \`content\`; surrounding assistant prose is never copied into the file. Never call Write with only a path, and never invent or recover missing content from prose.
+- An empty \`content\` string creates an empty file. Use it only when an empty file is genuinely intended.
+- A file is not created or updated until this tool returns a success result. If validation fails, correct the arguments and retry; do not claim the write succeeded.
 - Prefer the Edit tool for modifying existing files \u2014 it only sends the diff. Only use this tool to create new files or for complete rewrites.
 - NEVER create documentation files (*.md) or README files unless explicitly requested by the User.
 - Only use emojis if the user explicitly requests it. Avoid writing emojis to files unless asked.`;
@@ -144901,6 +144745,8 @@ function getExploreSystemPrompt() {
   const embedded = hasEmbeddedSearchTools();
   const globGuidance = embedded ? `- Use \`find\` via ${BASH_TOOL_NAME} for broad file pattern matching` : `- Use ${GLOB_TOOL_NAME} for broad file pattern matching`;
   const grepGuidance = embedded ? `- Use \`grep\` via ${BASH_TOOL_NAME} for searching file contents with regex` : `- Use ${GREP_TOOL_NAME} for searching file contents with regex`;
+  const shellGuidance = embedded ? `- Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find, grep, cat, head, tail)
+- NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, package installation, redirects, or any file creation/modification` : "";
   return `You are a file search specialist for Ur. You excel at thoroughly navigating and exploring codebases.
 
 === CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS ===
@@ -144924,8 +144770,7 @@ Guidelines:
 ${globGuidance}
 ${grepGuidance}
 - Use ${FILE_READ_TOOL_NAME} when you know the specific file path you need to read
-- Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find${embedded ? ", grep" : ""}, cat, head, tail)
-- NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, npm install, pip install, or any file creation/modification
+${shellGuidance}
 - Adapt your search approach based on the thoroughness level specified by the caller
 - Communicate your final report directly as a regular message - do NOT attempt to create files
 
@@ -144945,6 +144790,7 @@ var init_exploreAgent = __esm(() => {
   EXPLORE_AGENT = {
     agentType: "Explore",
     whenToUse: EXPLORE_WHEN_TO_USE,
+    tools: hasEmbeddedSearchTools() ? [BASH_TOOL_NAME, FILE_READ_TOOL_NAME] : [GLOB_TOOL_NAME, GREP_TOOL_NAME, FILE_READ_TOOL_NAME],
     disallowedTools: [
       AGENT_TOOL_NAME,
       EXIT_PLAN_MODE_TOOL_NAME,
@@ -144955,6 +144801,7 @@ var init_exploreAgent = __esm(() => {
     source: "built-in",
     baseDir: "built-in",
     model: process.env.USER_TYPE === "ant" ? "inherit" : "modelH",
+    permissionMode: "dontAsk",
     omitAgentMd: true,
     getSystemPrompt: () => getExploreSystemPrompt()
   };
@@ -144994,9 +144841,58 @@ var init_generalPurposeAgent = __esm(() => {
   };
 });
 
+// src/tools/TaskCreateTool/constants.ts
+var TASK_CREATE_TOOL_NAME = "TaskCreate";
+
+// src/tools/TaskUpdateTool/constants.ts
+var TASK_UPDATE_TOOL_NAME = "TaskUpdate";
+
+// src/tools/TodoWriteTool/constants.ts
+var TODO_WRITE_TOOL_NAME = "TodoWrite";
+
+// src/constants/planImplementationContract.ts
+function getApprovedPlanCapabilities(toolUseContext) {
+  const tools = toolUseContext.options.tools;
+  const hasTaskV2 = tools.some((tool) => toolMatchesName(tool, TASK_CREATE_TOOL_NAME)) && tools.some((tool) => toolMatchesName(tool, TASK_UPDATE_TOOL_NAME));
+  const hasTodoWrite = tools.some((tool) => toolMatchesName(tool, TODO_WRITE_TOOL_NAME));
+  const hasAgent = tools.some((tool) => toolMatchesName(tool, AGENT_TOOL_NAME));
+  const activeAgents = toolUseContext.options.agentDefinitions?.activeAgents ?? [];
+  const implementationAgentType = hasAgent ? ["worker", "general-purpose"].find((agentType) => activeAgents.some((agent) => agent.agentType === agentType && agent.source === "built-in")) : undefined;
+  return {
+    taskTool: hasTaskV2 ? "task-v2" : hasTodoWrite ? "todo-write" : "none",
+    ...implementationAgentType ? { implementationAgentType } : {}
+  };
+}
+function getApprovedPlanImplementationInstruction(capabilities) {
+  const taskTracking = capabilities.taskTool === "task-v2" ? [
+    `Use one ${TASK_CREATE_TOOL_NAME} call per cohesive, independently verifiable outcome; one umbrella task does not satisfy this requirement. Keep genuinely atomic work whole instead of manufacturing file- or tool-call-level tasks.`,
+    `Emit independent ${TASK_CREATE_TOOL_NAME} calls together (up to 8 per turn), then use ${TASK_UPDATE_TOOL_NAME} to add dependencies once task IDs are known. Leave unrelated tasks unblocked.`
+  ] : capabilities.taskTool === "todo-write" ? [
+    `Use ${TODO_WRITE_TOOL_NAME} to record the complete list with one item per cohesive, independently verifiable outcome; one umbrella item does not satisfy this requirement. Keep genuinely atomic work whole instead of manufacturing file- or tool-call-level items.`,
+    "Order dependent items after their prerequisites, keep every real outcome visible, and update each status from pending to in_progress to completed only as evidence is obtained."
+  ] : [
+    "Use the plan\u2019s numbered Implementation Tasks as the execution checklist, with one cohesive, independently verifiable outcome per item. Keep genuinely atomic work whole; do not invent unavailable task tools."
+  ];
+  const delegation = capabilities.implementationAgentType ? `After the graph is complete, launch up to 8 ready tasks with no conflicting shared mutation per parallel wave through ${AGENT_TOOL_NAME} using subagent_type=${capabilities.implementationAgentType}; continue with later waves as slots free. Give each worker its ${capabilities.taskTool === "task-v2" ? "task ID" : "numbered outcome"}, bounded scope, dependency outputs, completion check, and required verification. Keep dependent tasks and conflicting shared writes sequential; independently verify worker results before completing their tasks.` : "After the graph is complete, execute ready tasks in dependency order and independently verify each result before completing its task.";
+  return [
+    "Before changing the workspace, translate the approved plan into a complete task graph.",
+    ...taskTracking,
+    delegation
+  ].join(`
+`);
+}
+var PLAN_TASK_GRAPH_REQUIREMENT = "Add an **Implementation Tasks** section with one numbered task per cohesive, independently verifiable outcome. Do not collapse separate deliverables into one umbrella task or split atomic work into file/tool-call micro-tasks. For each task, state its completion check, real dependencies, and whether it can run in a parallel worker wave.";
+var init_planImplementationContract = __esm(() => {
+  init_Tool();
+  init_constants2();
+});
+
 // src/tools/AgentTool/built-in/planAgent.ts
 function getPlanV2SystemPrompt() {
-  const searchToolsHint = hasEmbeddedSearchTools() ? `\`find\`, \`grep\`, and ${FILE_READ_TOOL_NAME}` : `${GLOB_TOOL_NAME}, ${GREP_TOOL_NAME}, and ${FILE_READ_TOOL_NAME}`;
+  const embedded = hasEmbeddedSearchTools();
+  const searchToolsHint = embedded ? `\`find\`, \`grep\`, and ${FILE_READ_TOOL_NAME}` : `${GLOB_TOOL_NAME}, ${GREP_TOOL_NAME}, and ${FILE_READ_TOOL_NAME}`;
+  const shellGuidance = embedded ? `   - Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find, grep, cat, head, tail)
+   - NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, package installation, redirects, or any file creation/modification` : "";
   return `You are a software architect and planning specialist for Ur. Your role is to explore the codebase and design implementation plans.
 
 === CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS ===
@@ -145023,8 +144919,7 @@ You will be provided with a set of requirements and optionally a perspective on
    - Understand the current architecture
    - Identify similar features as reference
    - Trace through relevant code paths
-   - Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find${hasEmbeddedSearchTools() ? ", grep" : ""}, cat, head, tail)
-   - NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, npm install, pip install, or any file creation/modification
+${shellGuidance}
 
 3. **Design Solution**:
    - Create implementation approach based on your assigned perspective
@@ -145038,6 +144933,9 @@ You will be provided with a set of requirements and optionally a perspective on
 
 ## Required Output
 
+Include an **Implementation Tasks** section before the critical-files list.
+${PLAN_TASK_GRAPH_REQUIREMENT}
+
 End your response with:
 
 ### Critical Files for Implementation
@@ -145050,6 +144948,7 @@ REMEMBER: You can ONLY explore and plan. You CANNOT and MUST NOT write, edit, or
 }
 var PLAN_AGENT;
 var init_planAgent = __esm(() => {
+  init_planImplementationContract();
   init_prompt2();
   init_prompt3();
   init_prompt();
@@ -145068,6 +144967,7 @@ var init_planAgent = __esm(() => {
     ],
     source: "built-in",
     tools: EXPLORE_AGENT.tools,
+    permissionMode: "dontAsk",
     baseDir: "built-in",
     model: "inherit",
     omitAgentMd: true,
@@ -145368,7 +145268,7 @@ Use the literal string \`VERDICT: \` followed by exactly one of \`PASS\`, \`FAIL
 // src/tools/AgentTool/builtInAgents.ts
 function areExplorePlanAgentsEnabled() {
   if (false) {}
-  return false;
+  return !(isEnvTruthy(process.env.UR_AGENT_SDK_DISABLE_BUILTIN_AGENTS) && getIsNonInteractiveSession());
 }
 function getBuiltInAgents() {
   if (isEnvTruthy(process.env.UR_AGENT_SDK_DISABLE_BUILTIN_AGENTS) && getIsNonInteractiveSession()) {
@@ -145394,7 +145294,6 @@ function getBuiltInAgents() {
 }
 var init_builtInAgents = __esm(() => {
   init_state();
-  init_growthbook();
   init_envUtils();
   init_urCodeGuideAgent();
   init_exploreAgent();
@@ -155213,7 +155112,7 @@ var init_projectSafety = __esm(() => {
 function getInstruments() {
   if (instruments)
     return instruments;
-  const meter = import_api10.metrics.getMeter("ur-agent.gen_ai", "1.65.9");
+  const meter = import_api10.metrics.getMeter("ur-agent.gen_ai", "1.65.11");
   instruments = {
     operationDuration: meter.createHistogram("gen_ai.client.operation.duration", {
       description: "GenAI operation duration.",
@@ -155311,7 +155210,7 @@ function genAiAgentAttributes() {
     "gen_ai.operation.name": GEN_AI_OPERATION_INVOKE_AGENT,
     "gen_ai.provider.name": "ur",
     "gen_ai.agent.name": "UR-Nexus",
-    "gen_ai.agent.version": "1.65.9"
+    "gen_ai.agent.version": "1.65.11"
   };
 }
 function genAiWorkflowAttributes(workflowName) {
@@ -155327,7 +155226,7 @@ function genAiWorkflowAttributes(workflowName) {
 function startGenAiWorkflowSpan(workflowName) {
   const attributes = genAiWorkflowAttributes(workflowName);
   const name = typeof attributes["gen_ai.workflow.name"] === "string" ? `invoke_workflow ${attributes["gen_ai.workflow.name"]}` : GEN_AI_OPERATION_INVOKE_WORKFLOW;
-  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.9").startSpan(name, { kind: import_api10.SpanKind.INTERNAL, attributes });
+  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.11").startSpan(name, { kind: import_api10.SpanKind.INTERNAL, attributes });
 }
 function endGenAiWorkflowSpan(span, options2 = {}) {
   try {
@@ -155365,7 +155264,7 @@ function startGenAiMemorySpan(operation, options2 = {}) {
   if (options2.recordCount !== undefined && Number.isInteger(options2.recordCount) && options2.recordCount >= 0) {
     attributes["gen_ai.memory.record.count"] = options2.recordCount;
   }
-  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.9").startSpan(operation, { kind: import_api10.SpanKind.INTERNAL, attributes });
+  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.11").startSpan(operation, { kind: import_api10.SpanKind.INTERNAL, attributes });
 }
 function endGenAiMemorySpan(span, options2 = {}) {
   try {
@@ -248848,7 +248747,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "1.65.9";
+    attributes["app.version"] = "1.65.11";
   }
   const oauthAccount = getOauthAccountInfo();
   if (oauthAccount) {
@@ -265059,11 +264958,11 @@ Preview content is rendered as markdown in a monospace box. Multi-line text with
     html: `
 Preview feature:
 Use the optional \`preview\` field on options when presenting concrete artifacts that users need to visually compare:
-- HTML mockups of UI layouts or components
-- Formatted code snippets showing different implementations
-- Visual comparisons or diagrams
+- Plain-text or ASCII mockups of UI layouts or components
+- Inert code snippets showing different implementations
+- Textual visual comparisons or diagrams
 
-Preview content must be a self-contained HTML fragment (no <html>/<body> wrapper, no <script> or <style> tags \u2014 use inline style attributes instead). Do not use previews for simple preference questions where labels and descriptions suffice. Note: previews are only supported for single-select questions (not multiSelect).
+Preview content is untrusted text: raw HTML is not accepted or executed. It is escaped and rendered as inert preformatted text. Do not include HTML tags, attributes, URLs, scripts, styles, event handlers, or other executable markup. Do not use previews for simple preference questions where labels and descriptions suffice. Note: previews are only supported for single-select questions (not multiSelect).
 `
   };
   ASK_USER_QUESTION_TOOL_PROMPT = `Use this tool when you need to ask the user questions during execution. This allows you to:
@@ -265074,10 +264973,20 @@ Preview content must be a self-contained HTML fragment (no <html>/<body> wrapper
 
 Strongly prefer this tool over asking a question in plain assistant text. Any time your reply would end with a question that offers the user options or asks them to choose a direction (e.g. "Would you like A or B?", "Which approach should I take?", "Want me to do X or Y?"), call this tool with those options instead so the user gets a selectable arrow-key menu. Only ask in plain text when the answer is genuinely open-ended and cannot be expressed as a small set of choices.
 
+Strict input hierarchy:
+- Invoke the tool with exactly one top-level \`questions\` array containing 1-4 complete question objects.
+- Every question object contains \`question\`, a concise \`header\` (maximum 12 characters), and an \`options\` array with 2-8 option objects. Use \`multiSelect: true\` only when more than one choice may apply.
+- Every option object contains a \`label\`. Add \`description\` only when it contributes a real consequence, trade-off, or limitation; \`preview\` is optional.
+- Keep each question and its own options nested together. Never put option rows directly in the top-level \`questions\` array, and never send incomplete header/prompt-only entries.
+
+Canonical valid tool arguments (invoke the structured tool; do not print this object as prose):
+{"questions":[{"question":"Which database should we use?","header":"Database","options":[{"label":"PostgreSQL (Recommended)","description":"Strong consistency and concurrency; requires a running server and migrations."},{"label":"SQLite","description":"Zero setup and a single file; unsuitable for multiple concurrent writers."}],"multiSelect":false}]}
+
 Usage notes:
 - Users will always be able to select "Other" to provide custom text input, so it is safe to offer choices even when you are unsure you have listed every option
 - Use multiSelect: true to allow multiple answers to be selected for a question
 - If you recommend a specific option, make that the first option in the list and add "(Recommended)" at the end of the label
+- Do not over-question. Ask only decisions that materially affect the result and cannot be inferred safely. If more than four decisions are truly needed, ask the most blocking 1-4 first and ask the remainder in a later round.
 
 Writing the three fields \u2014 they must each carry DIFFERENT information:
 - \`header\` names the dimension being decided ("Database", "Auth method"). It is not a shortened copy of the question.
@@ -265101,24 +265010,15 @@ Plan mode note: In plan mode, use this tool to clarify requirements or choose be
 `;
 });
 
-// src/tools/TodoWriteTool/constants.ts
-var TODO_WRITE_TOOL_NAME = "TodoWrite";
-
 // src/tools/SkillTool/constants.ts
 var SKILL_TOOL_NAME = "Skill";
 
-// src/tools/TaskCreateTool/constants.ts
-var TASK_CREATE_TOOL_NAME = "TaskCreate";
-
 // src/tools/TaskGetTool/constants.ts
 var TASK_GET_TOOL_NAME = "TaskGet";
 
 // src/tools/TaskListTool/constants.ts
 var TASK_LIST_TOOL_NAME = "TaskList";
 
-// src/tools/TaskUpdateTool/constants.ts
-var TASK_UPDATE_TOOL_NAME = "TaskUpdate";
-
 // src/tools/EnterWorktreeTool/constants.ts
 var ENTER_WORKTREE_TOOL_NAME = "EnterWorktree";
 
@@ -295391,7 +295291,7 @@ function getInstallationEnv() {
   return;
 }
 function getURCodeVersion() {
-  return "1.65.9";
+  return "1.65.11";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -302722,7 +302622,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client2 = new Client({
       name: "ur",
       title: "UR",
-      version: "1.65.9",
+      version: "1.65.11",
       description: "UR-Nexus autonomous engineering workflow engine",
       websiteUrl: PRODUCT_URL
     }, {
@@ -303082,7 +302982,7 @@ var init_client5 = __esm(() => {
       const client2 = new Client({
         name: "ur",
         title: "UR",
-        version: "1.65.9",
+        version: "1.65.11",
         description: "UR-Nexus autonomous engineering workflow engine",
         websiteUrl: PRODUCT_URL
       }, {
@@ -315621,7 +315521,7 @@ async function createRuntime() {
   bootstrapTelemetry();
   const resource = defaultResource().merge(detectResources({ detectors: [envDetector] })).merge(resourceFromAttributes({
     [import_semantic_conventions7.ATTR_SERVICE_NAME]: "ur-agent",
-    [import_semantic_conventions7.ATTR_SERVICE_VERSION]: "1.65.9"
+    [import_semantic_conventions7.ATTR_SERVICE_VERSION]: "1.65.11"
   }));
   const tracerProvider = exporters.traces.length > 0 ? new BasicTracerProvider({
     resource,
@@ -315654,11 +315554,11 @@ async function createRuntime() {
   setMeterProvider(meterProvider);
   setLoggerProvider(loggerProvider);
   if (meterProvider) {
-    const meter = meterProvider.getMeter("ur-agent", "1.65.9");
+    const meter = meterProvider.getMeter("ur-agent", "1.65.11");
     setMeter(meter, (name, options2) => meter.createCounter(name, options2));
   }
   if (loggerProvider) {
-    setEventLogger(loggerProvider.getLogger("ur-agent.events", "1.65.9"));
+    setEventLogger(loggerProvider.getLogger("ur-agent.events", "1.65.11"));
   }
   if (!cleanupRegistered2) {
     cleanupRegistered2 = true;
@@ -316320,9 +316220,9 @@ async function assertMinVersion() {
   if (false) {}
   try {
     const versionConfig = await getDynamicConfig_BLOCKS_ON_INIT("tengu_version_config", { minVersion: "0.0.0" });
-    if (versionConfig.minVersion && lt("1.65.9", versionConfig.minVersion)) {
+    if (versionConfig.minVersion && lt("1.65.11", versionConfig.minVersion)) {
       console.error(`
-It looks like your version of UR (${"1.65.9"}) needs an update.
+It looks like your version of UR (${"1.65.11"}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
 
 To update, please run:
@@ -316538,7 +316438,7 @@ async function installGlobalPackage(specificVersion) {
     logError2(new AutoUpdaterError("Another process is currently installing an update"));
     logEvent("tengu_auto_updater_lock_contention", {
       pid: process.pid,
-      currentVersion: "1.65.9"
+      currentVersion: "1.65.11"
     });
     return "in_progress";
   }
@@ -316547,7 +316447,7 @@ async function installGlobalPackage(specificVersion) {
     if (!env2.isRunningWithBun() && env2.isNpmFromWindowsPath()) {
       logError2(new Error("Windows NPM detected in WSL environment"));
       logEvent("tengu_auto_updater_windows_npm_in_wsl", {
-        currentVersion: "1.65.9"
+        currentVersion: "1.65.11"
       });
       console.error(`
 Error: Windows NPM detected in WSL
@@ -317082,7 +316982,7 @@ function detectLinuxGlobPatternWarnings() {
 }
 async function getDoctorDiagnostic() {
   const installationType = await getCurrentInstallationType();
-  const version2 = typeof MACRO !== "undefined" ? "1.65.9" : "unknown";
+  const version2 = typeof MACRO !== "undefined" ? "1.65.11" : "unknown";
   const installationPath = await getInstallationPath();
   const invokedBinary = getInvokedBinary();
   const multipleInstallations = await detectMultipleInstallations();
@@ -318017,8 +317917,8 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
     const maxVersion = await getMaxVersion();
     if (maxVersion && gt(version2, maxVersion)) {
       logForDebugging(`Native installer: maxVersion ${maxVersion} is set, capping update from ${version2} to ${maxVersion}`);
-      if (gte("1.65.9", maxVersion)) {
-        logForDebugging(`Native installer: current version ${"1.65.9"} is already at or above maxVersion ${maxVersion}, skipping update`);
+      if (gte("1.65.11", maxVersion)) {
+        logForDebugging(`Native installer: current version ${"1.65.11"} is already at or above maxVersion ${maxVersion}, skipping update`);
         logEvent("tengu_native_update_skipped_max_version", {
           latency_ms: Date.now() - startTime,
           max_version: maxVersion,
@@ -318029,7 +317929,7 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
       version2 = maxVersion;
     }
   }
-  if (!forceReinstall && version2 === "1.65.9" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
+  if (!forceReinstall && version2 === "1.65.11" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
     logForDebugging(`Found ${version2} at ${executablePath}, skipping install`);
     logEvent("tengu_native_update_complete", {
       latency_ms: Date.now() - startTime,
@@ -339523,19 +339423,23 @@ that can be completed clearly in fewer than three small steps.
 
 ## Lifecycle
 
-1. Put todos in dependency order. Each item must be specific, actionable, and
-   independently checkable.
-2. Provide both forms for every item:
+1. Decompose non-trivial work into one item per cohesive outcome with its own
+   observable done check. Split separately completable deliverables out of
+   omnibus items, but keep genuinely atomic work as one item; never create
+   items merely for individual files, tool calls, or tiny mechanical steps.
+2. Put todos in dependency order. Keep unrelated outcomes independent rather
+   than inventing dependencies.
+3. Provide both forms for every item:
    - \`content\`: imperative outcome, such as "Run tests".
    - \`activeForm\`: present-continuous status, such as "Running tests".
-3. Mark the next unblocked item \`in_progress\` when work starts. Keep only one
+4. Mark the next unblocked item \`in_progress\` when work starts. Keep only one
    item \`in_progress\` in this agent's list.
-4. Update the list immediately when requirements or discovered work change.
-5. Mark an item \`completed\` only after its implementation and relevant
+5. Update the list immediately when requirements or discovered work change.
+6. Mark an item \`completed\` only after its implementation and relevant
    verification have succeeded. Do not batch completion updates.
-6. If work is partial, blocked, or failing, leave the item open and record the
+7. If work is partial, blocked, or failing, leave the item open and record the
    concrete follow-up or blocker in the list.
-7. Remove an item only when it is genuinely obsolete or was created by mistake.
+8. Remove an item only when it is genuinely obsolete or was created by mistake.
 
 Never mark an item completed when tests still fail, an error is unresolved, a
 required dependency is missing, or only part of the outcome was implemented.
@@ -361089,14 +360993,15 @@ function getEditToolDescription() {
 }
 function getDefaultEditDescription() {
   const prefixFormat = isCompactLinePrefixEnabled() ? "line number + tab" : "spaces + line number + arrow";
-  const minimalUniquenessHint = process.env.USER_TYPE === "ant" ? `
-- Use the smallest old_string that's clearly unique \u2014 usually 2-4 adjacent lines is sufficient. Avoid including 10+ lines of context when less uniquely identifies the target.` : "";
+  const minimalUniquenessHint = `
+- Use the smallest old_string that's clearly unique \u2014 usually 2-4 adjacent lines is sufficient. Avoid including 10+ lines of context when less uniquely identifies the target. Split changes across distant HTML/CSS/JavaScript sections into separate edits instead of replacing one large cross-section block.`;
   return `Performs exact string replacements in files.
 
 Usage:${getPreReadInstruction2()}
 - When editing text from Read tool output, ensure you preserve the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: ${prefixFormat}. Everything after that is the actual file content to match. Never include any part of the line number prefix in the old_string or new_string.
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
 - Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.
+- \`old_string\` must be copied from a recent Read of the target file as one exact, contiguous block. Never reconstruct it from memory, from an earlier full-file Write, or from what you expected the file to contain. If it is not found, re-read the target region and retry with a corrected smaller block; never retry the unchanged call.
 - The edit will FAIL if \`old_string\` is not unique in the file. Either provide a larger string with more surrounding context to make it unique or use \`replace_all\` to change every instance of \`old_string\`.${minimalUniquenessHint}
 - Use \`replace_all\` for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.`;
 }
@@ -361140,6 +361045,7 @@ var init_types11 = __esm(() => {
     structuredPatch: exports_external.array(hunkSchema()).describe("Diff patch showing the changes"),
     userModified: exports_external.boolean().describe("Whether the user modified the proposed changes"),
     replaceAll: exports_external.boolean().describe("Whether all occurrences were replaced"),
+    alreadyApplied: exports_external.boolean().optional().describe("Whether the requested deletion-only replacement was already present and no write was needed"),
     gitDiff: gitDiffSchema().optional()
   }));
 });
@@ -363476,6 +363382,58 @@ function findActualStringWhitespaceTolerant(fileContent, searchString) {
   }
   return null;
 }
+function findSearchAnchor(fileContent, searchString) {
+  const fileLines = fileContent.split(`
+`);
+  const occurrencesByLine = new Map;
+  for (let index2 = 0;index2 < fileLines.length; index2++) {
+    const normalized = normalizeLineForMatch(fileLines[index2]);
+    if (normalized.trim().length === 0)
+      continue;
+    const occurrence = occurrencesByLine.get(normalized);
+    if (occurrence) {
+      occurrence.count++;
+    } else {
+      occurrencesByLine.set(normalized, { firstIndex: index2, count: 1 });
+    }
+  }
+  let repeatedMatch = null;
+  for (const searchLine of searchString.split(`
+`)) {
+    const normalized = normalizeLineForMatch(searchLine);
+    if (normalized.trim().length === 0)
+      continue;
+    const occurrence = occurrencesByLine.get(normalized);
+    if (!occurrence)
+      continue;
+    if (occurrence.count === 1) {
+      return { fileLine: occurrence.firstIndex + 1, unique: true };
+    }
+    repeatedMatch ??= {
+      fileLine: occurrence.firstIndex + 1,
+      unique: false
+    };
+  }
+  return repeatedMatch;
+}
+function formatStringNotFoundMessage(fileContent, searchString) {
+  const lineCount = searchString.split(`
+`).length;
+  const anchor = findSearchAnchor(fileContent, searchString);
+  const location = anchor ? `A line from old_string ${anchor.unique ? "uniquely " : ""}matches the current file at line ${anchor.fileLine}, but the complete ${lineCount}-line block is not contiguous there.` : "No complete non-empty line from old_string matches the current file.";
+  const recovery = anchor ? `Re-read the target around line ${anchor.fileLine}, then retry with the smallest unique contiguous old_string copied from the current Read output (usually 2-4 lines).` : "Search for a short distinctive fragment, re-read the current target region, then retry with the smallest unique contiguous old_string (usually 2-4 lines).";
+  const preview = searchString.length > STRING_NOT_FOUND_PREVIEW_CHARS ? `${searchString.slice(0, STRING_NOT_FOUND_PREVIEW_CHARS)}
+\u2026 [old_string preview truncated; ${searchString.length} characters total]` : searchString;
+  return [
+    "String to replace not found in file.",
+    location,
+    recovery,
+    "Do not include Read line-number prefixes. Split large cross-section replacements into smaller edits, and do not retry this call unchanged.",
+    `old_string preview:
+${preview}`
+  ].join(`
+`);
+}
 function findActualString(fileContent, searchString) {
   if (fileContent.includes(searchString)) {
     return searchString;
@@ -363488,6 +363446,15 @@ function findActualString(fileContent, searchString) {
   }
   return findActualStringWhitespaceTolerant(fileContent, searchString);
 }
+function isDeletionOnlyEditAlreadyApplied(fileContent, oldString, newString, replaceAll) {
+  if (replaceAll || oldString.length === 0 || newString.length === 0 || oldString === newString || !oldString.includes(newString) || findActualString(fileContent, oldString) !== null) {
+    return false;
+  }
+  const actualNewString = findActualString(fileContent, newString);
+  if (actualNewString === null)
+    return false;
+  return fileContent.split(actualNewString).length - 1 === 1;
+}
 function preserveQuoteStyle(oldString, actualOldString, newString) {
   if (oldString === actualOldString) {
     return newString;
@@ -363787,7 +363754,7 @@ function areFileEditsInputsEquivalent(input1, input2) {
   }
   return areFileEditsEquivalent(input1.edits, input2.edits, fileContent);
 }
-var LEFT_SINGLE_CURLY_QUOTE = "\u2018", RIGHT_SINGLE_CURLY_QUOTE = "\u2019", LEFT_DOUBLE_CURLY_QUOTE = "\u201C", RIGHT_DOUBLE_CURLY_QUOTE = "\u201D", DIFF_SNIPPET_MAX_BYTES = 8192, DESANITIZATIONS;
+var LEFT_SINGLE_CURLY_QUOTE = "\u2018", RIGHT_SINGLE_CURLY_QUOTE = "\u2019", LEFT_DOUBLE_CURLY_QUOTE = "\u201C", RIGHT_DOUBLE_CURLY_QUOTE = "\u201D", STRING_NOT_FOUND_PREVIEW_CHARS = 600, DIFF_SNIPPET_MAX_BYTES = 8192, DESANITIZATIONS;
 var init_utils10 = __esm(() => {
   init_libesm();
   init_log2();
@@ -363863,11 +363830,20 @@ function renderToolUseMessage9({
 function renderToolResultMessage8({
   filePath,
   structuredPatch: structuredPatch2,
-  originalFile
+  originalFile,
+  alreadyApplied
 }, _progressMessagesForMessage, {
   style,
   verbose
 }) {
+  if (alreadyApplied) {
+    return /* @__PURE__ */ jsx_dev_runtime132.jsxDEV(MessageResponse, {
+      children: /* @__PURE__ */ jsx_dev_runtime132.jsxDEV(ThemedText, {
+        dimColor: true,
+        children: "Already up to date"
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
   const isPlanFile = filePath.startsWith(getPlansDirectory());
   return /* @__PURE__ */ jsx_dev_runtime132.jsxDEV(FileEditToolUpdatedMessage, {
     filePath,
@@ -364343,11 +364319,13 @@ var init_FileEditTool = __esm(() => {
       const file2 = fileContent;
       const actualOldString = findActualString(file2, old_string);
       if (!actualOldString) {
+        if (isDeletionOnlyEditAlreadyApplied(file2, old_string, new_string, replace_all)) {
+          return { result: true };
+        }
         return {
           result: false,
           behavior: "ask",
-          message: `String to replace not found in file.
-String: ${old_string}`,
+          message: formatStringNotFoundMessage(file2, old_string),
           meta: {
             isFilePathAbsolute: String(isAbsolute24(file_path))
           },
@@ -364407,6 +364385,27 @@ String: ${old_string}`,
       const { file_path, old_string, new_string, replace_all = false } = input;
       const fs4 = getFsImplementation();
       const absoluteFilePath = expandPath(file_path);
+      const initialState = readFileForEdit(absoluteFilePath);
+      if (initialState.fileExists) {
+        const lastRead = readFileState.get(absoluteFilePath);
+        if (!lastRead || getFileModificationTime(absoluteFilePath) > lastRead.timestamp || !fileStateMatchesContent(initialState.content, lastRead)) {
+          throw new Error(FILE_UNEXPECTEDLY_MODIFIED_ERROR);
+        }
+        if (isDeletionOnlyEditAlreadyApplied(initialState.content, old_string, new_string, replace_all)) {
+          return {
+            data: {
+              filePath: file_path,
+              oldString: old_string,
+              newString: new_string,
+              originalFile: initialState.content,
+              structuredPatch: [],
+              userModified: userModified ?? false,
+              replaceAll: replace_all,
+              alreadyApplied: true
+            }
+          };
+        }
+      }
       const cwd2 = getCwd();
       if (!isEnvTruthy(process.env.UR_CODE_SIMPLE)) {
         const newSkillDirs = await discoverSkillDirsForPaths([absoluteFilePath], cwd2);
@@ -364524,7 +364523,14 @@ String: ${old_string}`,
       };
     },
     mapToolResultToToolResultBlockParam(data, toolUseID) {
-      const { filePath, userModified, replaceAll } = data;
+      const { filePath, userModified, replaceAll, alreadyApplied } = data;
+      if (alreadyApplied) {
+        return {
+          tool_use_id: toolUseID,
+          type: "tool_result",
+          content: `The file ${filePath} already contains the requested replacement. No change was needed.`
+        };
+      }
       const modifiedNote = userModified ? ".  The user modified your proposed changes before accepting them. " : "";
       if (replaceAll) {
         return {
@@ -371511,9 +371517,9 @@ var permissionSetupModule = null, allowedPromptSchema, allowedPromptsSchema, inp
 var init_ExitPlanModeV2Tool = __esm(() => {
   init_v4();
   init_state();
+  init_planImplementationContract();
   init_analytics();
   init_Tool();
-  init_agentSwarmsEnabled();
   init_debug();
   init_inProcessTeammateHelpers();
   init_log2();
@@ -371521,7 +371527,6 @@ var init_ExitPlanModeV2Tool = __esm(() => {
   init_slowOperations();
   init_teammate();
   init_teammateMailbox();
-  init_constants2();
   init_prompt14();
   init_UI18();
   allowedPromptSchema = lazySchema(() => exports_external.object({
@@ -371541,7 +371546,8 @@ var init_ExitPlanModeV2Tool = __esm(() => {
     plan: exports_external.string().nullable().describe("The plan that was presented to the user"),
     isAgent: exports_external.boolean(),
     filePath: exports_external.string().optional().describe("The file path where the plan was saved"),
-    hasTaskTool: exports_external.boolean().optional().describe("Whether the Agent tool is available in the current context"),
+    implementationTaskTool: exports_external.enum(["task-v2", "todo-write", "none"]).optional().describe("Task tracking surface available after approval"),
+    implementationAgentType: exports_external.string().optional().describe("Executable built-in implementation worker type, when present"),
     planWasEdited: exports_external.boolean().optional().describe("True when the user edited the plan (CCR web UI or Ctrl+G); determines whether the plan is echoed back in tool_result"),
     awaitingLeaderApproval: exports_external.boolean().optional().describe("When true, the teammate has sent a plan approval request to the team leader"),
     requestId: exports_external.string().optional().describe("Unique identifier for the plan approval request")
@@ -371696,13 +371702,14 @@ var init_ExitPlanModeV2Tool = __esm(() => {
           }
         };
       });
-      const hasTaskTool = isAgentSwarmsEnabled() && context5.options.tools.some((t) => toolMatchesName(t, AGENT_TOOL_NAME));
+      const implementationCapabilities = getApprovedPlanCapabilities(context5);
       return {
         data: {
           plan,
           isAgent,
           filePath,
-          hasTaskTool: hasTaskTool || undefined,
+          implementationTaskTool: implementationCapabilities.taskTool,
+          implementationAgentType: implementationCapabilities.implementationAgentType,
           planWasEdited: inputPlan !== undefined || undefined
         }
       };
@@ -371711,7 +371718,8 @@ var init_ExitPlanModeV2Tool = __esm(() => {
       isAgent,
       plan,
       filePath,
-      hasTaskTool,
+      implementationTaskTool,
+      implementationAgentType,
       planWasEdited,
       awaitingLeaderApproval,
       requestId
@@ -371749,16 +371757,19 @@ Request ID: ${requestId}`,
           tool_use_id: toolUseID
         };
       }
-      const teamHint = hasTaskTool ? `
-
-If this plan can be broken down into multiple independent tasks, consider using the ${TEAM_CREATE_TOOL_NAME} tool to create a team and parallelize the work.` : "";
+      const implementationInstruction = getApprovedPlanImplementationInstruction({
+        taskTool: implementationTaskTool ?? "none",
+        ...implementationAgentType ? { implementationAgentType } : {}
+      });
       const planLabel = planWasEdited ? "Approved Plan (edited by user)" : "Approved Plan";
       return {
         type: "tool_result",
-        content: `User has approved your plan. You can now start coding. Start with updating your todo list if applicable
+        content: `User has approved your plan. You can now start implementation.
 
 Your plan has been saved to: ${filePath}
-You can refer back to it if needed during implementation.${teamHint}
+You can refer back to it if needed during implementation.
+
+${implementationInstruction}
 
 ## ${planLabel}:
 ${plan}`,
@@ -373179,6 +373190,21 @@ function TungstenLiveMonitor() {
 }
 var TungstenTool = null;
 
+// src/utils/zodToJsonSchema.ts
+function zodToJsonSchema3(schema) {
+  const hit = cache3.get(schema);
+  if (hit)
+    return hit;
+  const result = toJSONSchema(schema);
+  cache3.set(schema, result);
+  return result;
+}
+var cache3;
+var init_zodToJsonSchema2 = __esm(() => {
+  init_v4();
+  cache3 = new WeakMap;
+});
+
 // src/tools/AskUserQuestionTool/AskUserQuestionTool.tsx
 function objectValue3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -373198,81 +373224,108 @@ function stringField2(input, names) {
 }
 function normalizeQuestionOptionInput(value) {
   if (typeof value === "string") {
-    const label2 = value.trim();
-    return label2 ? {
-      label: label2,
-      description: label2
+    const label = value.trim();
+    return label ? {
+      label
     } : value;
   }
   const option = objectValue3(value);
   if (!option)
     return value;
-  const label = typeof option.label === "string" && option.label.trim() ? option.label.trim() : typeof option.value === "string" && option.value.trim() ? option.value.trim() : typeof option.description === "string" && option.description.trim() ? option.description.trim() : "";
-  const description = typeof option.description === "string" && option.description.trim() ? option.description.trim() : label;
-  if (!label || !description)
-    return value;
-  return {
-    label,
-    description,
-    ...typeof option.preview === "string" ? {
-      preview: option.preview
-    } : {}
-  };
+  const normalized = { ...option };
+  if (typeof option.label === "string")
+    normalized.label = option.label.trim();
+  if (typeof option.description === "string")
+    normalized.description = option.description.trim();
+  if (typeof option.preview === "string")
+    normalized.preview = normalizePreviewInput(option.preview);
+  return normalized;
+}
+function normalizePreviewInput(preview) {
+  if (getQuestionPreviewFormat() !== "html")
+    return preview;
+  const alreadySafe = preview.match(/^<pre data-ur-preview="text">([\s\S]*)<\/pre>$/);
+  if (alreadySafe && !alreadySafe[1]?.includes("<"))
+    return preview;
+  const escaped = preview.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;");
+  return `<pre data-ur-preview="text">${escaped}</pre>`;
 }
 function normalizeQuestionInput(value, index2) {
   const question = objectValue3(value);
-  if (!question || !Array.isArray(question.options))
-    return value;
-  const questionText = stringField2(question, ["question", "questionText", "question_text", "prompt", "text", "title", "message", "body"]);
-  if (!questionText)
+  if (!question)
     return value;
-  return {
-    question: questionText,
-    header: typeof question.header === "string" && question.header.trim() ? question.header.trim().slice(0, ASK_USER_QUESTION_TOOL_CHIP_WIDTH) : headerFromQuestion2(questionText, index2),
-    options: question.options.map(normalizeQuestionOptionInput),
-    ...typeof question.multiSelect === "boolean" ? {
-      multiSelect: question.multiSelect
-    } : {}
-  };
+  const normalized = { ...question };
+  const questionText = stringField2(question, [...QUESTION_TEXT_ALIASES]);
+  if (questionText)
+    normalized.question = questionText;
+  for (const alias of QUESTION_TEXT_ALIASES) {
+    if (alias !== "question")
+      delete normalized[alias];
+  }
+  let options2 = question.options;
+  if (options2 === undefined && question.choices !== undefined) {
+    options2 = question.choices;
+    delete normalized.choices;
+  }
+  if (typeof options2 === "string") {
+    const parsed = parseToolInputJsonLenient(options2);
+    if (Array.isArray(parsed))
+      options2 = parsed;
+  }
+  if (Array.isArray(options2)) {
+    normalized.options = options2.map(normalizeQuestionOptionInput);
+  }
+  if (typeof question.header === "string" && question.header.trim()) {
+    normalized.header = question.header.trim();
+  } else if (questionText) {
+    normalized.header = headerFromQuestion2(questionText, index2);
+  }
+  return normalized;
 }
 function normalizeAskUserQuestionInput2(value) {
   const input = objectValue3(value);
   if (!input)
     return value;
-  const commonFields = {
-    ...objectValue3(input.answers) ? {
-      answers: input.answers
-    } : {},
-    ...objectValue3(input.annotations) ? {
-      annotations: input.annotations
-    } : {},
-    ...objectValue3(input.metadata) ? {
-      metadata: input.metadata
-    } : {}
-  };
-  if (typeof input.questions === "string") {
-    const parsed = parseToolInputJsonLenient(input.questions);
+  const normalized = { ...input };
+  let questions = input.questions;
+  if (typeof questions === "string") {
+    const parsed = parseToolInputJsonLenient(questions);
     if (Array.isArray(parsed))
-      input.questions = parsed;
+      questions = parsed;
   }
-  if (typeof input.options === "string") {
-    const parsed = parseToolInputJsonLenient(input.options);
-    if (Array.isArray(parsed))
-      input.options = parsed;
+  if (Array.isArray(questions)) {
+    normalized.questions = questions.map(normalizeQuestionInput);
+    return normalized;
   }
-  if (Array.isArray(input.questions)) {
-    return {
-      questions: input.questions.map(normalizeQuestionInput),
-      ...commonFields
-    };
+  let options2 = input.options;
+  if (typeof options2 === "string") {
+    const parsed = parseToolInputJsonLenient(options2);
+    if (Array.isArray(parsed))
+      options2 = parsed;
   }
-  if (typeof input.question === "string" && Array.isArray(input.options)) {
+  if (stringField2(input, [...QUESTION_TEXT_ALIASES]) && Array.isArray(options2)) {
+    const singleQuestion = normalizeQuestionInput({
+      question: stringField2(input, [...QUESTION_TEXT_ALIASES]),
+      ...input.header !== undefined ? {
+        header: input.header
+      } : {},
+      options: options2,
+      ...input.multiSelect !== undefined ? {
+        multiSelect: input.multiSelect
+      } : {}
+    }, 0);
+    for (const key of [...QUESTION_TEXT_ALIASES, "header", "options", "choices", "multiSelect"]) {
+      delete normalized[key];
+    }
     return {
-      questions: [normalizeQuestionInput(input, 0)],
-      ...commonFields
+      ...normalized,
+      questions: [singleQuestion]
     };
   }
-  return value;
+  return normalized;
+}
+function boundedText(max2, field) {
+  return exports_external.string().trim().min(1, `${field} cannot be empty`).max(max2, `${field} must be at most ${max2} characters`).refine((value) => !CONTROL_OR_ANSI_RE.test(value), `${field} must not contain control or ANSI escape characters`);
 }
 function AskUserQuestionResultMessage(t0) {
   const $2 = import_compiler_runtime114.c(3);
@@ -373337,18 +373390,15 @@ function _temp51(t0) {
 function validateHtmlPreview(preview) {
   if (preview === undefined)
     return null;
-  if (/<\s*(html|body|!doctype)\b/i.test(preview)) {
-    return "preview must be an HTML fragment, not a full document (no <html>, <body>, or <!DOCTYPE>)";
-  }
-  if (/<\s*(script|style)\b/i.test(preview)) {
-    return "preview must not contain <script> or <style> tags. Use inline styles via the style attribute if needed.";
-  }
-  if (!/<[a-z][^>]*>/i.test(preview)) {
-    return 'preview must contain HTML (previewFormat is set to "html"). Wrap content in a tag like <div> or <pre>.';
+  if (getQuestionPreviewFormat() !== "html")
+    return null;
+  const safeTextWrapper = preview.match(/^<pre data-ur-preview="text">([\s\S]*)<\/pre>$/);
+  if (!safeTextWrapper || safeTextWrapper[1]?.includes("<")) {
+    return "HTML previews must use UR\u2019s escaped text wrapper; raw model-provided HTML is not rendered";
   }
   return null;
 }
-var import_compiler_runtime114, jsx_dev_runtime145, questionOptionSchema, questionSchema, annotationsSchema, UNIQUENESS_REFINE, commonFields, inputSchema32, outputSchema27, AskUserQuestionTool;
+var import_compiler_runtime114, jsx_dev_runtime145, MAX_QUESTIONS = 4, MAX_OPTIONS = 8, MAX_QUESTION_CHARS = 500, MAX_LABEL_CHARS = 80, MAX_DESCRIPTION_CHARS = 500, MAX_PREVIEW_CHARS, MAX_PREVIEW_LINES = 200, MAX_ANSWER_CHARS = 2000, MAX_TOTAL_INPUT_CHARS, RESERVED_RECORD_KEYS, QUESTION_TEXT_ALIASES, CONTROL_OR_ANSI_RE, UNIQUENESS_REFINE, questionOptionSchema, questionSchema, annotationsSchema, responseFields, metadataSchema, requestObjectSchema, inputSchema32, modelInputJSONSchema, outputSchema27, AskUserQuestionTool;
 var init_AskUserQuestionTool = __esm(() => {
   init_state();
   init_MessageResponse();
@@ -373358,59 +373408,82 @@ var init_AskUserQuestionTool = __esm(() => {
   init_v4();
   init_ink2();
   init_Tool();
+  init_zodToJsonSchema2();
   init_prompt9();
   import_compiler_runtime114 = __toESM(require_compiler_runtime(), 1);
   jsx_dev_runtime145 = __toESM(require_jsx_dev_runtime(), 1);
-  questionOptionSchema = lazySchema(() => exports_external.object({
-    label: exports_external.string().describe('The choice itself, 1-5 words. Name the option, do not restate the question: for "Which database?" use "PostgreSQL", not "Use PostgreSQL for the database".'),
-    description: exports_external.string().describe('What actually happens if this is chosen, and the cost of choosing it \u2014 the information the user needs that the label does not already give them. Must NOT restate the label in a full sentence. Bad: label "PostgreSQL" / description "Use PostgreSQL." Good: label "PostgreSQL" / description "Relational, strong consistency; needs a running server and a migration step." Include the trade-off, limitation, or consequence that makes this choice different from the others.'),
-    preview: exports_external.string().optional().describe("Optional preview content rendered when this option is focused. Use for mockups, code snippets, or visual comparisons that help users compare options. See the tool description for the expected content format.")
-  }));
-  questionSchema = lazySchema(() => exports_external.object({
-    question: exports_external.string().describe('The complete question to ask the user. Should be clear, specific, and end with a question mark. Example: "Which library should we use for date formatting?" If multiSelect is true, phrase it accordingly, e.g. "Which features do you want to enable?"'),
-    header: exports_external.string().describe(`The category being decided, as a chip/tag (max ${ASK_USER_QUESTION_TOOL_CHIP_WIDTH} chars). Name the dimension, not the question: for "Which database should we use?" the header is "Database", not "Which DB". Examples: "Auth method", "Library", "Approach".`),
-    options: exports_external.array(questionOptionSchema()).min(2).max(8).describe(`REQUIRED: 2-8 concrete choices. A question with no options is not askable here \u2014 if you cannot name at least two specific answers, the question is open-ended, so ask it in plain assistant text instead of calling this tool. Do not call this tool with a prose question and omit options. Keep options concise and distinct; there should be no 'Other' option, that will be provided automatically.`),
-    multiSelect: exports_external.boolean().default(false).describe("Set to true to allow the user to select multiple options instead of just one. Use when choices are not mutually exclusive.")
-  }));
-  annotationsSchema = lazySchema(() => {
-    const annotationSchema = exports_external.object({
-      preview: exports_external.string().optional().describe("The preview content of the selected option, if the question used previews."),
-      notes: exports_external.string().optional().describe("Free-text notes the user added to their selection.")
-    });
-    return exports_external.record(exports_external.string(), annotationSchema).optional().describe("Optional per-question annotations from the user (e.g., notes on preview selections). Keyed by question text.");
-  });
+  MAX_PREVIEW_CHARS = 16 * 1024;
+  MAX_TOTAL_INPUT_CHARS = 64 * 1024;
+  RESERVED_RECORD_KEYS = new Set(["__proto__", "constructor", "prototype", "toString", "valueOf"]);
+  QUESTION_TEXT_ALIASES = ["question", "questionText", "question_text", "prompt", "text"];
+  CONTROL_OR_ANSI_RE = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]|\u001B\[/;
   UNIQUENESS_REFINE = {
     check: (data) => {
-      const questions = data.questions.map((q) => q.question);
+      const questions = data.questions.map((q) => q.question.toLocaleLowerCase());
       if (questions.length !== new Set(questions).size) {
         return false;
       }
       for (const question of data.questions) {
-        const labels = question.options.map((opt) => opt.label);
+        const labels = question.options.map((opt) => opt.label.toLocaleLowerCase());
         if (labels.length !== new Set(labels).size) {
           return false;
         }
       }
       return true;
     },
-    message: "Question texts must be unique, option labels must be unique within each question"
+    message: "Question texts must be unique, and option labels must be unique within each question (ignoring case)"
   };
-  commonFields = lazySchema(() => ({
-    answers: exports_external.record(exports_external.string(), exports_external.string()).optional().describe("User answers collected by the permission component"),
-    annotations: annotationsSchema(),
-    metadata: exports_external.object({
-      source: exports_external.string().optional().describe('Optional identifier for the source of this question (e.g., "remember" for /remember command). Used for analytics tracking.')
-    }).optional().describe("Optional metadata for tracking and analytics purposes. Not displayed to user.")
+  questionOptionSchema = lazySchema(() => exports_external.strictObject({
+    label: boundedText(MAX_LABEL_CHARS, "Option label").refine((label) => {
+      const normalized = label.trim().toLocaleLowerCase();
+      return normalized !== "other" && normalized !== "__other__";
+    }, "Do not provide an Other option; the UI supplies it automatically.").describe("The concise name of this choice, usually 1-5 words. It must be distinct from every other label in this question."),
+    description: boundedText(MAX_DESCRIPTION_CHARS, "Option description").optional().describe("Optional consequence, trade-off, or limitation that adds information beyond the label. Omit it when there is nothing useful to add; never duplicate the label merely to fill this field."),
+    preview: exports_external.string().max(MAX_PREVIEW_CHARS, `Option preview must be at most ${MAX_PREVIEW_CHARS} characters`).refine((value) => value.split(/\r?\n/).length <= MAX_PREVIEW_LINES, `Option preview must be at most ${MAX_PREVIEW_LINES} lines`).optional().describe("Optional bounded preview content rendered when this option is focused.")
+  }));
+  questionSchema = lazySchema(() => exports_external.strictObject({
+    question: boundedText(MAX_QUESTION_CHARS, "Question").refine((question) => !RESERVED_RECORD_KEYS.has(question), "Question text uses a reserved record key; rephrase it.").describe("The complete, specific decision question shown to the user. Ask one decision per object."),
+    header: boundedText(ASK_USER_QUESTION_TOOL_CHIP_WIDTH, "Question header").describe(`A short category chip naming the decision dimension, not a shortened question (max ${ASK_USER_QUESTION_TOOL_CHIP_WIDTH} characters; for \u201CWhich database?\u201D use \u201CDatabase\u201D).`),
+    options: exports_external.array(questionOptionSchema()).min(2).max(MAX_OPTIONS).describe(`REQUIRED: 2-${MAX_OPTIONS} concrete choices nested inside this question object. Do not put option rows directly in the top-level questions array.`),
+    multiSelect: exports_external.boolean().optional().describe("Set to true only when choices are not mutually exclusive. Omit it for ordinary single-select questions.")
+  }).refine((question) => !(question.multiSelect && question.options.some((option) => option.preview !== undefined)), {
+    message: "Preview choices are single-select only; remove previews or set multiSelect to false."
+  }));
+  annotationsSchema = lazySchema(() => {
+    const annotationSchema = exports_external.strictObject({
+      preview: exports_external.string().max(MAX_PREVIEW_CHARS).optional(),
+      notes: exports_external.string().trim().max(MAX_ANSWER_CHARS).optional()
+    });
+    return exports_external.record(exports_external.string(), annotationSchema).optional();
+  });
+  responseFields = lazySchema(() => ({
+    answers: exports_external.record(exports_external.string(), exports_external.string().trim().min(1).max(MAX_ANSWER_CHARS)).optional(),
+    annotations: annotationsSchema()
+  }));
+  metadataSchema = lazySchema(() => exports_external.strictObject({
+    source: exports_external.string().trim().min(1).max(100).optional()
+  }).optional());
+  requestObjectSchema = lazySchema(() => exports_external.strictObject({
+    questions: exports_external.array(questionSchema()).min(1).max(MAX_QUESTIONS).describe(`Questions to ask the user (1-${MAX_QUESTIONS}). Ask only decisions that materially affect the result and cannot be inferred.`),
+    metadata: metadataSchema()
+  }).refine(UNIQUENESS_REFINE.check, {
+    message: UNIQUENESS_REFINE.message
+  }).refine((input) => JSON.stringify(input).length <= MAX_TOTAL_INPUT_CHARS, {
+    message: `AskUserQuestion input must be at most ${MAX_TOTAL_INPUT_CHARS} characters`
   }));
   inputSchema32 = lazySchema(() => exports_external.preprocess(normalizeAskUserQuestionInput2, exports_external.strictObject({
-    questions: exports_external.array(questionSchema()).min(1).max(4).describe("Questions to ask the user (1-4 questions)"),
-    ...commonFields()
+    questions: exports_external.array(questionSchema()).min(1).max(MAX_QUESTIONS),
+    metadata: metadataSchema(),
+    ...responseFields()
   }).refine(UNIQUENESS_REFINE.check, {
     message: UNIQUENESS_REFINE.message
+  }).refine((input) => JSON.stringify(input).length <= MAX_TOTAL_INPUT_CHARS, {
+    message: `AskUserQuestion input must be at most ${MAX_TOTAL_INPUT_CHARS} characters`
   })));
-  outputSchema27 = lazySchema(() => exports_external.object({
+  modelInputJSONSchema = zodToJsonSchema3(requestObjectSchema());
+  outputSchema27 = lazySchema(() => exports_external.strictObject({
     questions: exports_external.array(questionSchema()).describe("The questions that were asked"),
-    answers: exports_external.record(exports_external.string(), exports_external.string()).describe("The answers provided by the user (question text -> answer string; multi-select answers are comma-separated)"),
+    answers: exports_external.record(exports_external.string(), exports_external.string().trim().min(1).max(MAX_ANSWER_CHARS)).describe("The answers provided by the user (question text -> answer string; multi-select answers are comma-separated)"),
     annotations: annotationsSchema()
   }));
   AskUserQuestionTool = buildTool({
@@ -373431,6 +373504,7 @@ var init_AskUserQuestionTool = __esm(() => {
     get inputSchema() {
       return inputSchema32();
     },
+    inputJSONSchema: modelInputJSONSchema,
     get outputSchema() {
       return outputSchema27();
     },
@@ -373453,14 +373527,10 @@ var init_AskUserQuestionTool = __esm(() => {
     requiresUserInteraction() {
       return true;
     },
-    async validateInput({
-      questions
-    }) {
-      if (getQuestionPreviewFormat() !== "html") {
-        return {
-          result: true
-        };
-      }
+    async validateInput(input, context5) {
+      const {
+        questions
+      } = input;
       for (const q of questions) {
         for (const opt of q.options) {
           const err2 = validateHtmlPreview(opt.preview);
@@ -373473,6 +373543,45 @@ var init_AskUserQuestionTool = __esm(() => {
           }
         }
       }
+      if (context5.validationPhase !== "post-permission") {
+        if (Object.prototype.hasOwnProperty.call(input, "answers") || Object.prototype.hasOwnProperty.call(input, "annotations")) {
+          return {
+            result: false,
+            message: "answers and annotations are response fields supplied only after trusted user interaction; omit them from the tool request",
+            errorCode: 1
+          };
+        }
+        return {
+          result: true
+        };
+      }
+      if (!Object.prototype.hasOwnProperty.call(input, "answers") || !input.answers) {
+        return {
+          result: false,
+          message: "No verified user answers were collected. AskUserQuestion cannot complete from an unchanged permission approval.",
+          errorCode: 1
+        };
+      }
+      const expectedQuestions = new Set(questions.map((question) => question.question));
+      const answerKeys = Object.keys(input.answers);
+      const missingAnswers = questions.filter((question) => !Object.prototype.hasOwnProperty.call(input.answers, question.question)).map((question) => question.question);
+      const unexpectedAnswers = answerKeys.filter((key) => !expectedQuestions.has(key));
+      if (missingAnswers.length > 0 || unexpectedAnswers.length > 0) {
+        const details = [...missingAnswers.length > 0 ? [`missing: ${missingAnswers.join(", ")}`] : [], ...unexpectedAnswers.length > 0 ? [`unexpected: ${unexpectedAnswers.join(", ")}`] : []].join("; ");
+        return {
+          result: false,
+          message: `Verified answers must contain exactly one entry for every question (${details}).`,
+          errorCode: 1
+        };
+      }
+      const unexpectedAnnotations = Object.keys(input.annotations ?? {}).filter((key) => !expectedQuestions.has(key));
+      if (unexpectedAnnotations.length > 0) {
+        return {
+          result: false,
+          message: `User annotations contain unknown question keys: ${unexpectedAnnotations.join(", ")}`,
+          errorCode: 1
+        };
+      }
       return {
         result: true
       };
@@ -373520,9 +373629,12 @@ var init_AskUserQuestionTool = __esm(() => {
     },
     async call({
       questions,
-      answers = {},
+      answers,
       annotations
     }, _context) {
+      if (!answers) {
+        throw new Error("AskUserQuestion reached execution without verified user answers");
+      }
       return {
         data: {
           questions,
@@ -375224,10 +375336,10 @@ function DANGEROUS_uncachedSystemPromptSection(name, compute, _reason) {
   return { name, compute, cacheBreak: true };
 }
 async function resolveSystemPromptSections(sections) {
-  const cache3 = getSystemPromptSectionCache();
+  const cache4 = getSystemPromptSectionCache();
   return Promise.all(sections.map(async (s) => {
-    if (!s.cacheBreak && cache3.has(s.name)) {
-      return cache3.get(s.name) ?? null;
+    if (!s.cacheBreak && cache4.has(s.name)) {
+      return cache4.get(s.name) ?? null;
     }
     const value = await s.compute();
     setSystemPromptSectionCacheEntry(s.name, value);
@@ -377510,6 +377622,23 @@ var init_ConfigTool = __esm(() => {
   });
 });
 
+// src/tools/taskIdInput.ts
+function taskIdInputSchema(description) {
+  return exports_external.union([
+    exports_external.string().min(1),
+    exports_external.number().int().positive().max(Number.MAX_SAFE_INTEGER)
+  ]).describe(description);
+}
+function normalizeTaskIdInput(taskId) {
+  return String(taskId);
+}
+function normalizeTaskIdInputs(taskIds) {
+  return taskIds?.map(normalizeTaskIdInput);
+}
+var init_taskIdInput = __esm(() => {
+  init_v4();
+});
+
 // src/tools/TaskCreateTool/prompt.ts
 function getPrompt4() {
   const teammateContext = isAgentSwarmsEnabled() ? " and potentially assigned to teammates" : "";
@@ -377543,6 +377672,23 @@ NOTE that you should not use this tool if there is only one trivial task to do.
 
 EXCEPTION: none of the "skip" rules apply when the user explicitly asks for an item to be added to the task list ("add to your tasks \u2026"). An explicit request always wins \u2014 create the task.
 
+## Decomposition Quality
+
+For non-trivial work, create the complete task graph before implementation:
+
+- One task represents one cohesive outcome with an observable done check.
+  Split an omnibus task when it contains separately completable deliverables.
+- Keep a genuinely atomic outcome as one task. Do not manufacture tasks for
+  individual files, tool calls, or tiny mechanical steps.
+- Express real ordering constraints with \`blocks\` / \`blockedBy\`. Leave
+  unrelated tasks unblocked so agents can claim them in parallel.
+- If delegation is available, launch mutually independent tasks concurrently
+  only when they have no conflicting shared mutations. Keep dependent or
+  conflicting work sequential.
+- Emit one \`TaskCreate\` call per outcome. Batch independent creates in the
+  same assistant turn (up to 8), then use \`TaskUpdate\` to add dependency
+  edges once IDs are known and before starting blocked work.
+
 ## Task Fields
 
 - **subject**: A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")
@@ -377574,17 +377720,21 @@ var init_TaskCreateTool = __esm(() => {
   init_hooks5();
   init_tasks();
   init_teammate();
+  init_taskIdInput();
   init_prompt18();
-  inputSchema38 = lazySchema(() => exports_external.strictObject({
-    subject: exports_external.string().describe("A brief title for the task"),
-    description: exports_external.string().describe("What needs to be done"),
-    activeForm: exports_external.string().optional().describe('Present continuous form shown in spinner when in_progress (e.g., "Running tests")'),
-    metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional().describe("Arbitrary metadata to attach to the task"),
-    blocks: exports_external.array(exports_external.string()).optional().describe("Task IDs that this task blocks at creation time"),
-    blockedBy: exports_external.array(exports_external.string()).optional().describe("Task IDs that block this task at creation time"),
-    addBlocks: exports_external.array(exports_external.string()).optional().describe("Alias for blocks, accepted for compatibility with TaskUpdate"),
-    addBlockedBy: exports_external.array(exports_external.string()).optional().describe("Alias for blockedBy, accepted for compatibility with TaskUpdate")
-  }));
+  inputSchema38 = lazySchema(() => {
+    const TaskIdSchema = taskIdInputSchema("A task dependency ID. Positive integer JSON values are accepted and normalized to strings.");
+    return exports_external.strictObject({
+      subject: exports_external.string().describe("A brief title for the task"),
+      description: exports_external.string().describe("What needs to be done"),
+      activeForm: exports_external.string().optional().describe('Present continuous form shown in spinner when in_progress (e.g., "Running tests")'),
+      metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional().describe("Arbitrary metadata to attach to the task"),
+      blocks: exports_external.array(TaskIdSchema).optional().describe("Task IDs that this task blocks at creation time"),
+      blockedBy: exports_external.array(TaskIdSchema).optional().describe("Task IDs that block this task at creation time"),
+      addBlocks: exports_external.array(TaskIdSchema).optional().describe("Alias for blocks, accepted for compatibility with TaskUpdate"),
+      addBlockedBy: exports_external.array(TaskIdSchema).optional().describe("Alias for blockedBy, accepted for compatibility with TaskUpdate")
+    });
+  });
   outputSchema33 = lazySchema(() => exports_external.object({
     task: exports_external.object({
       id: exports_external.string(),
@@ -377633,9 +377783,14 @@ var init_TaskCreateTool = __esm(() => {
       addBlocks,
       addBlockedBy
     }, context5) {
-      const initialBlocks = [...new Set([...blocks ?? [], ...addBlocks ?? []])];
+      const initialBlocks = [
+        ...new Set(normalizeTaskIdInputs([...blocks ?? [], ...addBlocks ?? []]) ?? [])
+      ];
       const initialBlockedBy = [
-        ...new Set([...blockedBy ?? [], ...addBlockedBy ?? []])
+        ...new Set(normalizeTaskIdInputs([
+          ...blockedBy ?? [],
+          ...addBlockedBy ?? []
+        ]) ?? [])
       ];
       const taskListId = getTaskListId();
       const taskId = await createTask(taskListId, {
@@ -377701,7 +377856,9 @@ var init_TaskCreateTool = __esm(() => {
       return {
         tool_use_id: toolUseID,
         type: "tool_result",
-        content: `Task #${task.id} created successfully: ${task.subject}`
+        content: `Task #${task.id} created successfully: ${task.subject}
+
+` + `If this is one outcome within non-trivial work, create the remaining ` + `outcome tasks before implementation. Keep one task only when the ` + `work is genuinely atomic.`
       };
     }
   });
@@ -377737,8 +377894,9 @@ var init_TaskGetTool = __esm(() => {
   init_v4();
   init_Tool();
   init_tasks();
+  init_taskIdInput();
   inputSchema39 = lazySchema(() => exports_external.strictObject({
-    taskId: exports_external.string().describe("The ID of the task to retrieve")
+    taskId: taskIdInputSchema("The ID of the task to retrieve. Positive integer JSON values are accepted and normalized to strings.")
   }));
   outputSchema34 = lazySchema(() => exports_external.object({
     task: exports_external.object({
@@ -377780,12 +377938,13 @@ var init_TaskGetTool = __esm(() => {
       return true;
     },
     toAutoClassifierInput(input) {
-      return input.taskId;
+      return String(input.taskId);
     },
     renderToolUseMessage() {
       return null;
     },
-    async call({ taskId }) {
+    async call({ taskId: rawTaskId }) {
+      const taskId = normalizeTaskIdInput(rawTaskId);
       const taskListId = getTaskListId();
       const task = await getTask(taskListId, taskId);
       if (!task) {
@@ -377912,16 +378071,18 @@ var init_TaskUpdateTool = __esm(() => {
   init_teammate();
   init_teammateMailbox();
   init_constants2();
+  init_taskIdInput();
   inputSchema40 = lazySchema(() => {
     const TaskUpdateStatusSchema = TaskStatusSchema2().or(exports_external.literal("deleted"));
+    const TaskIdSchema = taskIdInputSchema("The ID of the task to update. Positive integer JSON values are accepted and normalized to strings.");
     return exports_external.strictObject({
-      taskId: exports_external.string().describe("The ID of the task to update"),
+      taskId: TaskIdSchema,
       subject: exports_external.string().optional().describe("New subject for the task"),
       description: exports_external.string().optional().describe("New description for the task"),
       activeForm: exports_external.string().optional().describe('Present continuous form shown in spinner when in_progress (e.g., "Running tests")'),
       status: TaskUpdateStatusSchema.optional().describe("New status for the task"),
-      addBlocks: exports_external.array(exports_external.string()).optional().describe("Task IDs that this task blocks"),
-      addBlockedBy: exports_external.array(exports_external.string()).optional().describe("Task IDs that block this task"),
+      addBlocks: exports_external.array(TaskIdSchema).optional().describe("Task IDs that this task blocks. Positive integer JSON values are accepted and normalized to strings."),
+      addBlockedBy: exports_external.array(TaskIdSchema).optional().describe("Task IDs that block this task. Positive integer JSON values are accepted and normalized to strings."),
       owner: exports_external.string().optional().describe("New owner for the task"),
       metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional().describe("Metadata keys to merge into the task. Set a key to null to delete it.")
     });
@@ -377964,7 +378125,7 @@ var init_TaskUpdateTool = __esm(() => {
       return false;
     },
     toAutoClassifierInput(input) {
-      const parts = [input.taskId];
+      const parts = [String(input.taskId)];
       if (input.status)
         parts.push(input.status);
       if (input.subject)
@@ -377975,7 +378136,7 @@ var init_TaskUpdateTool = __esm(() => {
       return null;
     },
     async call({
-      taskId,
+      taskId: rawTaskId,
       subject,
       description,
       activeForm,
@@ -377985,6 +378146,9 @@ var init_TaskUpdateTool = __esm(() => {
       addBlockedBy,
       metadata
     }, context5) {
+      const taskId = normalizeTaskIdInput(rawTaskId);
+      const normalizedAddBlocks = normalizeTaskIdInputs(addBlocks);
+      const normalizedAddBlockedBy = normalizeTaskIdInputs(addBlockedBy);
       const taskListId = getTaskListId();
       context5.setAppState((prev) => {
         if (prev.expandedView === "tasks")
@@ -378003,12 +378167,12 @@ var init_TaskUpdateTool = __esm(() => {
         };
       }
       const requestedDependencies = [
-        ...(addBlocks ?? []).map((targetId) => ({
+        ...(normalizedAddBlocks ?? []).map((targetId) => ({
           fromTaskId: taskId,
           toTaskId: targetId,
           field: "addBlocks"
         })),
-        ...(addBlockedBy ?? []).map((blockerId) => ({
+        ...(normalizedAddBlockedBy ?? []).map((blockerId) => ({
           fromTaskId: blockerId,
           toTaskId: taskId,
           field: "addBlockedBy"
@@ -378082,7 +378246,7 @@ var init_TaskUpdateTool = __esm(() => {
             const tasksById = new Map((await listTasks(taskListId)).map((task) => [task.id, task]));
             const effectiveBlockers = new Set([
               ...existingTask.blockedBy,
-              ...addBlockedBy ?? []
+              ...normalizedAddBlockedBy ?? []
             ]);
             const unresolvedBlockers = [...effectiveBlockers].filter((blockerId) => {
               const blocker = tasksById.get(blockerId);
@@ -378121,8 +378285,8 @@ var init_TaskUpdateTool = __esm(() => {
           updatedFields.push("status");
         }
       }
-      const newBlocks = (addBlocks ?? []).filter((id) => !existingTask.blocks.includes(id));
-      const newBlockedBy = (addBlockedBy ?? []).filter((id) => !existingTask.blockedBy.includes(id));
+      const newBlocks = (normalizedAddBlocks ?? []).filter((id) => !existingTask.blocks.includes(id));
+      const newBlockedBy = (normalizedAddBlockedBy ?? []).filter((id) => !existingTask.blockedBy.includes(id));
       if (newBlocks.length > 0)
         updatedFields.push("blocks");
       if (newBlockedBy.length > 0)
@@ -378529,7 +378693,14 @@ var init_TeamCreateTool = __esm(() => {
     toAutoClassifierInput(input) {
       return input.team_name;
     },
-    async validateInput(input, _context) {
+    async validateInput(input, context5) {
+      if (context5.getAppState().toolPermissionContext.mode === "plan") {
+        return {
+          result: false,
+          message: "TeamCreate is unavailable in plan mode because it changes team and task state. Finish and approve the plan before creating a team; use read-only Explore or Plan agents for planning research.",
+          errorCode: 9
+        };
+      }
       if (!input.team_name || input.team_name.trim().length === 0) {
         return {
           result: false,
@@ -378560,6 +378731,9 @@ var init_TeamCreateTool = __esm(() => {
     async call(input, context5) {
       const { setAppState, getAppState } = context5;
       const { team_name, description: _description, agent_type } = input;
+      if (getAppState().toolPermissionContext.mode === "plan") {
+        throw new Error("TeamCreate is unavailable in plan mode because it changes team and task state.");
+      }
       const appState = getAppState();
       const existingTeam = appState.teamContext?.teamName;
       if (existingTeam) {
@@ -378704,6 +378878,16 @@ var init_TeamDeleteTool = __esm(() => {
     async prompt() {
       return getPrompt7();
     },
+    async validateInput(_input, context5) {
+      if (context5.getAppState().toolPermissionContext.mode === "plan") {
+        return {
+          result: false,
+          message: "TeamDelete is unavailable in plan mode because it changes team and task state. Finish or exit plan mode before deleting a team.",
+          errorCode: 9
+        };
+      }
+      return { result: true };
+    },
     mapToolResultToToolResultBlockParam(data, toolUseID) {
       return {
         tool_use_id: toolUseID,
@@ -378719,6 +378903,9 @@ var init_TeamDeleteTool = __esm(() => {
     async call(_input, context5) {
       const { setAppState, getAppState } = context5;
       const appState = getAppState();
+      if (appState.toolPermissionContext.mode === "plan") {
+        throw new Error("TeamDelete is unavailable in plan mode because it changes team and task state.");
+      }
       const teamName = appState.teamContext?.teamName;
       if (teamName) {
         const teamFile = readTeamFile(teamName);
@@ -381485,7 +381672,9 @@ The ${AGENT_TOOL_NAME} tool launches specialized agents (subprocesses) that auto
 
 ${agentListSection}
 
-${forkEnabled ? `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself \u2014 a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type parameter to select which agent type to use. If omitted, the general-purpose agent is used.`}`;
+${forkEnabled ? `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself \u2014 a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type parameter to select which agent type to use. If omitted, the general-purpose agent is used.`}
+
+For non-trivial delegation, define one cohesive task with its own observable done check per outcome before launching workers. Launch mutually independent tasks together only when they have no conflicting shared mutations; keep dependent or conflicting work sequential. Keep genuinely atomic work as one task instead of manufacturing extra agents.`;
   if (isCoordinator) {
     return shared;
   }
@@ -387616,7 +387805,7 @@ function isAnyTracingEnabled() {
   return isTelemetryEnabled() || isEnhancedTelemetryEnabled() || isBetaTracingEnabled();
 }
 function getTracer() {
-  return import_api39.trace.getTracer("ur-agent.gen_ai", "1.65.9");
+  return import_api39.trace.getTracer("ur-agent.gen_ai", "1.65.11");
 }
 function createSpanAttributes(spanType, customAttributes = {}) {
   const baseAttributes = getTelemetryAttributes();
@@ -388235,9 +388424,129 @@ function formatValidationPath(path14) {
     return index2 === 0 ? segmentStr : `${String(acc)}.${segmentStr}`;
   }, "");
 }
+function formatList(values2) {
+  const quoted = values2.map((value) => `\`${value}\``);
+  if (quoted.length <= 1)
+    return quoted[0] ?? "";
+  if (quoted.length === 2)
+    return `${quoted[0]} and ${quoted[1]}`;
+  return `${quoted.slice(0, -1).join(", ")}, and ${quoted.at(-1)}`;
+}
+function formatIndexSet(indexes) {
+  const sorted = [...new Set(indexes)].sort((a2, b) => a2 - b);
+  if (sorted.length === 0)
+    return "";
+  const contiguous = sorted.every((value, index2) => index2 === 0 || value === sorted[index2 - 1] + 1);
+  if (contiguous && sorted.length > 1) {
+    return `${sorted[0]}..${sorted.at(-1)}`;
+  }
+  return sorted.join(",");
+}
+function formatMissingParameterErrors(error40) {
+  const missing = error40.issues.map((issue2, order) => ({ issue: issue2, order })).filter(({ issue: issue2 }) => issue2.code === "invalid_type" && issue2.message.includes("received undefined"));
+  const byPathShape = new Map;
+  for (const { issue: issue2, order } of missing) {
+    const numericAt = issue2.path.findIndex((segment2) => typeof segment2 === "number");
+    if (numericAt === -1 || numericAt === issue2.path.length - 1)
+      continue;
+    const prefix = issue2.path.slice(0, numericAt);
+    const suffix = issue2.path.slice(numericAt + 1);
+    const index2 = issue2.path[numericAt];
+    if (typeof index2 !== "number")
+      continue;
+    const key = JSON.stringify([prefix, suffix]);
+    const group = byPathShape.get(key) ?? {
+      prefix,
+      suffix,
+      indexes: [],
+      issueOrders: [],
+      firstOrder: order
+    };
+    group.indexes.push(index2);
+    group.issueOrders.push(order);
+    byPathShape.set(key, group);
+  }
+  const combined = new Map;
+  for (const group of byPathShape.values()) {
+    const indexes = [...new Set(group.indexes)].sort((a2, b) => a2 - b);
+    if (indexes.length < 2)
+      continue;
+    const key = JSON.stringify([group.prefix, indexes]);
+    const entry = combined.get(key) ?? {
+      prefix: group.prefix,
+      indexes,
+      fields: [],
+      issueOrders: [],
+      firstOrder: group.firstOrder
+    };
+    entry.fields.push(formatValidationPath(group.suffix));
+    entry.issueOrders.push(...group.issueOrders);
+    entry.firstOrder = Math.min(entry.firstOrder, group.firstOrder);
+    combined.set(key, entry);
+  }
+  const lines = [];
+  const consumed = new Set;
+  for (const entry of combined.values()) {
+    const base2 = `${formatValidationPath(entry.prefix)}[${formatIndexSet(entry.indexes)}]`;
+    const fields = [...new Set(entry.fields)];
+    lines.push({
+      order: entry.firstOrder,
+      text: fields.length === 1 ? `The required field ${formatList(fields)} is missing from \`${base2}\`` : `The required fields ${formatList(fields)} are missing from \`${base2}\``
+    });
+    for (const order of entry.issueOrders)
+      consumed.add(order);
+  }
+  for (const { issue: issue2, order } of missing) {
+    if (consumed.has(order))
+      continue;
+    lines.push({
+      order,
+      text: `The required parameter \`${formatValidationPath(issue2.path)}\` is missing`
+    });
+  }
+  return lines.sort((a2, b) => a2.order - b.order).map((line) => line.text);
+}
+function formatSizeConstraintErrors(error40) {
+  const result = [];
+  for (const issue2 of error40.issues) {
+    if (issue2.code !== "too_big" && issue2.code !== "too_small")
+      continue;
+    const detail = issue2;
+    const limit = issue2.code === "too_big" ? detail.maximum : detail.minimum;
+    if (limit === undefined) {
+      result.push(issue2.message);
+      continue;
+    }
+    const path14 = formatValidationPath(issue2.path) || "input";
+    const inclusive = detail.inclusive !== false;
+    const comparison = issue2.code === "too_big" ? inclusive ? "at most" : "fewer than" : inclusive ? "at least" : "more than";
+    const unit = detail.origin === "array" ? "items" : detail.origin === "string" ? "characters" : null;
+    result.push(unit ? `The parameter \`${path14}\` must contain ${comparison} ${String(limit)} ${unit}` : `The parameter \`${path14}\` must be ${comparison} ${String(limit)}`);
+  }
+  return [...new Set(result)];
+}
+function getAskUserQuestionCorrection(error40) {
+  if (!error40.issues.some((issue2) => issue2.path[0] === "questions"))
+    return null;
+  const inferredCount = error40.issues.reduce((count3, issue2) => {
+    const index2 = issue2.path[0] === "questions" ? issue2.path[1] : undefined;
+    return typeof index2 === "number" ? Math.max(count3, index2 + 1) : count3;
+  }, 0);
+  const countNotice = inferredCount > 4 ? ` This call contains at least ${inferredCount} incomplete question entries.` : "";
+  return "AskUserQuestion requires 1-4 complete question objects. Each object must " + "contain `question`, `header`, and an `options` array with 2-8 " + "objects containing `label`; include `description` only when it adds a " + "useful consequence or trade-off." + countNotice + " Do not invent missing choices or truncate entries. Retry with at most " + "four complete questions, ask remaining decisions in later rounds, and " + "do not repeat the unchanged call.";
+}
+function getWriteCorrection(error40) {
+  const missingRequiredField = error40.issues.some((issue2) => issue2.code === "invalid_type" && issue2.message.includes("received undefined") && (issue2.path[0] === "file_path" || issue2.path[0] === "content"));
+  if (!missingRequiredField)
+    return null;
+  return "No file was written. Write requires both `file_path` and `content` in " + "the same structured tool call. Assistant prose outside the call is not " + "file content and will not be copied into it. Retry only after supplying " + "the complete intended file text in `content`; do not repeat the " + "unchanged call or claim the file was created until Write returns success.";
+}
 function formatZodValidationError(toolName, error40) {
-  const missingParams = error40.issues.filter((err2) => err2.code === "invalid_type" && err2.message.includes("received undefined")).map((err2) => formatValidationPath(err2.path));
-  const unexpectedParams = error40.issues.filter((err2) => err2.code === "unrecognized_keys").flatMap((err2) => err2.keys);
+  const missingParamErrors = formatMissingParameterErrors(error40);
+  const sizeConstraintErrors = formatSizeConstraintErrors(error40);
+  const unexpectedParams = [
+    ...new Set(error40.issues.filter((err2) => err2.code === "unrecognized_keys").flatMap((err2) => err2.keys))
+  ];
   const typeMismatchParams = error40.issues.filter((err2) => err2.code === "invalid_type" && !err2.message.includes("received undefined")).map((err2) => {
     const typeErr = err2;
     const receivedMatch = err2.message.match(/received (\w+)/);
@@ -388250,10 +388559,8 @@ function formatZodValidationError(toolName, error40) {
   });
   let errorContent = error40.message;
   const errorParts = [];
-  if (missingParams.length > 0) {
-    const missingParamErrors = missingParams.map((param) => `The required parameter \`${param}\` is missing`);
-    errorParts.push(...missingParamErrors);
-  }
+  errorParts.push(...sizeConstraintErrors);
+  errorParts.push(...missingParamErrors);
   if (unexpectedParams.length > 0) {
     const unexpectedParamErrors = unexpectedParams.map((param) => `An unexpected parameter \`${param}\` was provided`);
     errorParts.push(...unexpectedParamErrors);
@@ -388266,6 +388573,19 @@ function formatZodValidationError(toolName, error40) {
     errorContent = `${toolName} failed due to the following ${errorParts.length > 1 ? "issues" : "issue"}:
 ${errorParts.join(`
 `)}`;
+  }
+  if (toolName === "AskUserQuestion") {
+    const correction = getAskUserQuestionCorrection(error40);
+    if (correction)
+      errorContent += `
+
+${correction}`;
+  } else if (toolName === "Write") {
+    const correction = getWriteCorrection(error40);
+    if (correction)
+      errorContent += `
+
+${correction}`;
   }
   return errorContent;
 }
@@ -388292,6 +388612,36 @@ function isPlanArtifactMutationForGate(input) {
     return false;
   }
 }
+function isLocalPreviewOpenForTaskGate(input) {
+  if (input.toolName !== "Bash" || typeof input.toolInput !== "object" || input.toolInput === null) {
+    return false;
+  }
+  const candidate = input.toolInput;
+  if (typeof candidate.command !== "string" || candidate.command.trim() === "" || candidate.run_in_background === true || candidate.dangerouslyDisableSandbox === true || candidate._simulatedSedEdit !== undefined) {
+    return false;
+  }
+  const command = candidate.command;
+  if (command.includes("$") || command.includes("`") || command.includes("\\") || command.includes(`
+`) || command.includes("\r") || command.includes("\x00") || hasUnbalancedQuotes(command)) {
+    return false;
+  }
+  const parsed = tryParseShellCommand(command);
+  if (!parsed.success || parsed.tokens.length !== 2 || parsed.tokens.some((token) => typeof token !== "string") || parsed.tokens[0] !== "open") {
+    return false;
+  }
+  try {
+    const url3 = new URL(parsed.tokens[1]);
+    return (url3.protocol === "http:" || url3.protocol === "https:") && LOOPBACK_PREVIEW_HOSTS.has(url3.hostname) && url3.username === "" && url3.password === "";
+  } catch {
+    return false;
+  }
+}
+function isMutationRequiringTaskList(input) {
+  return input.isMutating && !isLocalPreviewOpenForTaskGate({
+    toolName: input.toolName,
+    toolInput: input.toolInput
+  });
+}
 function getTaskListGateConfig() {
   const configured = getInitialSettings()?.tasks?.requireBeforeChanges;
   if (!configured)
@@ -388328,28 +388678,36 @@ function checkTaskListGate(input) {
     return { allowed: true };
   }
   if (input.taskCount === null) {
+    const taskTool2 = input.taskPlanningToolName ?? "TaskCreate";
     return {
       allowed: false,
-      reason: `The task list could not be read, so ${input.toolName} was not allowed ` + `to change state without a verifiable plan. Retry TaskList or ` + `TaskCreate, then retry this call. Disable with ` + `tasks.requireBeforeChanges.enabled=false in settings.`
+      reason: `The task list could not be read, so ${input.toolName} was not allowed ` + `to change state without a verifiable plan. Use ${taskTool2} to create ` + `or repair the task list, then retry this call. ` + `${TASK_DECOMPOSITION_RECOVERY} ` + `Disable with ` + `tasks.requireBeforeChanges.enabled=false in settings.`
     };
   }
   if (input.isSubagent || ALWAYS_REQUIRE_PLAN_TOOLS.has(input.toolName)) {
+    const taskTool2 = input.taskPlanningToolName ?? "TaskCreate";
+    const terminalContext = input.totalTaskCount !== null && input.totalTaskCount !== undefined && input.totalTaskCount > 0 ? " The existing task list contains only terminal tasks." : "";
     return {
       allowed: false,
-      reason: `No actionable parent task exists for ${input.toolName}. Call ` + `TaskCreate before delegating or changing state, then retry this call. ` + `Disable with tasks.requireBeforeChanges.enabled=false in settings.`
+      reason: `No actionable parent task exists for ${input.toolName}.` + `${terminalContext} Call ${taskTool2} before delegating or changing ` + `state, then retry this call. ` + `${TASK_DECOMPOSITION_RECOVERY} ` + `Disable with tasks.requireBeforeChanges.enabled=false in settings.`
     };
   }
   if (input.readsSoFar < config2.freeReads)
     return { allowed: true };
+  const taskTool = input.taskPlanningToolName ?? "TaskCreate";
+  const hasTerminalTaskList = input.totalTaskCount !== null && input.totalTaskCount !== undefined && input.totalTaskCount > 0;
+  const taskState = hasTerminalTaskList ? "The task list exists, but every tracked task is terminal, so no actionable task remains" : "No actionable task exists";
+  const recovery = taskTool === "TodoWrite" ? "Call TodoWrite first to add a cohesive remaining todo or move the relevant todo back to pending/in_progress" : taskTool === "TaskCreate" ? "Call TaskCreate first to add a cohesive remaining task, or call TaskUpdate to move the relevant task back to pending/in_progress" : `Use ${taskTool} first to add or reopen a cohesive pending/in_progress task`;
   return {
     allowed: false,
-    reason: `No task list exists, and ${input.toolName} changes the workspace. ` + `Call TaskCreate first with the steps you intend to take, then retry ` + `this call. Reads are unrestricted, so investigate as much as you need ` + `before writing the list. ` + `Disable with tasks.requireBeforeChanges.enabled=false in settings.`
+    reason: `${taskState}, and ${input.toolName} changes workspace state. ` + `${recovery}, then retry this call. Keep preview, launch, and ` + `verification work actionable until its observable check has actually ` + `run; do not mark that task complete before the check. ` + `${TASK_DECOMPOSITION_RECOVERY} Reads are unrestricted, so investigate ` + `as much as you need before writing the list. ` + `Disable with tasks.requireBeforeChanges.enabled=false in settings.`
   };
 }
-var TASK_LIST_GATE_DEFAULTS, KNOWN_MUTATING_TOOLS, GATE_EXEMPT_TOOLS, ALWAYS_REQUIRE_PLAN_TOOLS, PLAN_ARTIFACT_MUTATING_TOOLS;
+var TASK_LIST_GATE_DEFAULTS, KNOWN_MUTATING_TOOLS, GATE_EXEMPT_TOOLS, ALWAYS_REQUIRE_PLAN_TOOLS, TASK_DECOMPOSITION_RECOVERY, PLAN_ARTIFACT_MUTATING_TOOLS, LOOPBACK_PREVIEW_HOSTS;
 var init_taskListGate = __esm(() => {
   init_settings2();
   init_path();
+  init_shellQuote();
   TASK_LIST_GATE_DEFAULTS = {
     enabled: true,
     freeReads: 3
@@ -388372,17 +388730,24 @@ var init_taskListGate = __esm(() => {
     "TaskUpdate",
     "TaskList",
     "TaskGet",
-    "TodoWrite"
+    "TodoWrite",
+    "ExitPlanMode"
   ]);
   ALWAYS_REQUIRE_PLAN_TOOLS = new Set([
     "Agent",
     "Task"
   ]);
+  TASK_DECOMPOSITION_RECOVERY = "For non-trivial work, create one task per cohesive outcome with its own " + "observable done check; keep one task only when the work is genuinely atomic.";
   PLAN_ARTIFACT_MUTATING_TOOLS = new Set([
     "Write",
     "Edit",
     "MultiEdit"
   ]);
+  LOOPBACK_PREVIEW_HOSTS = new Set([
+    "localhost",
+    "127.0.0.1",
+    "[::1]"
+  ]);
 });
 
 // src/services/tools/repeatedFailureGuard.ts
@@ -389434,10 +389799,18 @@ async function countTasksForGate(toolUseContext) {
     const { getTaskListId: getTaskListId2, inspectTaskListForGate: inspectTaskListForGate2, isTodoV2Enabled: isTodoV2Enabled2 } = await Promise.resolve().then(() => (init_tasks(), exports_tasks));
     if (!isTodoV2Enabled2()) {
       const todoKey = toolUseContext.agentId ?? getSessionId();
-      return countActionableTodosForGate(toolUseContext.getAppState().todos?.[todoKey]);
+      const todos = toolUseContext.getAppState().todos?.[todoKey] ?? [];
+      return {
+        actionableCount: countActionableTodosForGate(todos),
+        totalCount: todos.length
+      };
     }
     const inspection = await inspectTaskListForGate2(getTaskListId2());
-    return countActionableTasksForGate(inspection.tasks);
+    const userTasks = inspection.tasks.filter((task) => !task.metadata?._internal);
+    return {
+      actionableCount: countActionableTasksForGate(userTasks),
+      totalCount: userTasks.length
+    };
   } catch {
     return null;
   }
@@ -389460,6 +389833,36 @@ function isCurrentPlanArtifactMutation(toolName, input, toolUseContext) {
     return false;
   }
 }
+function isReadOnlyPlanAgentDelegation(tool, input, toolUseContext) {
+  try {
+    if (toolUseContext.getAppState().toolPermissionContext.mode !== "plan" || !toolMatchesName(tool, AGENT_TOOL_NAME) || typeof input !== "object" || input === null) {
+      return false;
+    }
+    const candidate = input;
+    if (typeof candidate.subagent_type !== "string" || !READ_ONLY_PLAN_AGENT_TYPES.has(candidate.subagent_type) || candidate.name !== undefined || candidate.team_name !== undefined || candidate.mode !== undefined || candidate.isolation !== undefined || candidate.cwd !== undefined || candidate.run_in_background === true) {
+      return false;
+    }
+    const activeAgent = toolUseContext.options.agentDefinitions?.activeAgents?.find((agent) => agent.agentType === candidate.subagent_type);
+    return activeAgent?.source === "built-in";
+  } catch {
+    return false;
+  }
+}
+function isBuiltInReadOnlyPlanningSubagent(toolUseContext) {
+  if (!toolUseContext.agentId || !toolUseContext.agentType || !READ_ONLY_PLAN_AGENT_TYPES.has(toolUseContext.agentType)) {
+    return false;
+  }
+  return toolUseContext.options.agentDefinitions?.activeAgents?.find((agent) => agent.agentType === toolUseContext.agentType)?.source === "built-in";
+}
+function getTaskPlanningToolName(toolUseContext) {
+  if (toolUseContext.options.tools.some((tool) => toolMatchesName(tool, TASK_CREATE_TOOL_NAME))) {
+    return TASK_CREATE_TOOL_NAME;
+  }
+  if (toolUseContext.options.tools.some((tool) => toolMatchesName(tool, TODO_WRITE_TOOL_NAME))) {
+    return TODO_WRITE_TOOL_NAME;
+  }
+  return "the available task-list tool";
+}
 function getStopHookInfo(attachment) {
   if (typeof attachment !== "object" || attachment === null || !("command" in attachment) || typeof attachment.command !== "string" || !("durationMs" in attachment) || typeof attachment.durationMs !== "number") {
     return null;
@@ -389920,18 +390323,43 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
   const initiallyValidatedCallSig = callSig;
   let isMutating = true;
   try {
-    isMutating = !tool.isReadOnly(parsedInput.data);
+    isMutating = !tool.isReadOnly(parsedInput.data) && !isReadOnlyPlanAgentDelegation(tool, parsedInput.data, toolUseContext);
   } catch {
     isMutating = true;
   }
   const isPlanArtifactMutation = isCurrentPlanArtifactMutation(tool.name, parsedInput.data, toolUseContext);
+  const isTaskListGatedMutation = isMutationRequiringTaskList({
+    toolName: tool.name,
+    toolInput: parsedInput.data,
+    isMutating
+  });
+  if (isMutating && isBuiltInReadOnlyPlanningSubagent(toolUseContext)) {
+    recordCallFailure(callSig);
+    return [
+      {
+        message: createUserMessage({
+          content: [
+            {
+              type: "tool_result",
+              content: "<tool_use_error>ReadOnlyPlanningAgent: Built-in Explore and Plan agents may only perform read-only operations. Return your findings to the parent agent instead of changing state.</tool_use_error>",
+              is_error: true,
+              tool_use_id: toolUseID
+            }
+          ]
+        })
+      }
+    ];
+  }
+  const taskCounts = await countTasksForGate(toolUseContext);
   const gate = checkTaskListGate({
     toolName: tool.name,
-    taskCount: await countTasksForGate(toolUseContext),
+    taskCount: taskCounts?.actionableCount ?? null,
+    totalTaskCount: taskCounts?.totalCount ?? null,
     readsSoFar: countToolCallsBeforeCurrent(toolUseContext.messages, assistantMessage, toolUseID),
     isSubagent: Boolean(toolUseContext.agentId),
-    isMutating,
-    isPlanArtifactMutation
+    isMutating: isTaskListGatedMutation,
+    isPlanArtifactMutation,
+    taskPlanningToolName: getTaskPlanningToolName(toolUseContext)
   });
   if (gate.allowed === false) {
     recordCallFailure(callSig);
@@ -390255,7 +390683,7 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
     });
     return resultingMessages;
   }
-  if (callSig !== initiallyValidatedCallSig) {
+  if (callSig !== initiallyValidatedCallSig || tool.requiresUserInteraction?.()) {
     const finalValidation = await tool.validateInput?.(finalParsedInput.data, {
       ...toolUseContext,
       validationPhase: "post-permission"
@@ -390282,20 +390710,46 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
   }
   let finalIsMutating = true;
   try {
-    finalIsMutating = !tool.isReadOnly(finalParsedInput.data);
+    finalIsMutating = !tool.isReadOnly(finalParsedInput.data) && !isReadOnlyPlanAgentDelegation(tool, finalParsedInput.data, toolUseContext);
   } catch {
     finalIsMutating = true;
   }
   const finalIsPlanArtifactMutation = isCurrentPlanArtifactMutation(tool.name, finalParsedInput.data, toolUseContext);
-  const effectiveCallChanged = callSig !== initiallyValidatedCallSig || finalIsMutating !== isMutating || finalIsPlanArtifactMutation !== isPlanArtifactMutation;
-  if (finalIsMutating && !finalIsPlanArtifactMutation) {
+  const finalIsTaskListGatedMutation = isMutationRequiringTaskList({
+    toolName: tool.name,
+    toolInput: finalParsedInput.data,
+    isMutating: finalIsMutating
+  });
+  if (finalIsMutating && isBuiltInReadOnlyPlanningSubagent(toolUseContext)) {
+    recordCallFailure(callSig);
+    finishPreExecutionRejection();
+    resultingMessages.push({
+      message: createUserMessage({
+        content: [
+          {
+            type: "tool_result",
+            content: "<tool_use_error>ReadOnlyPlanningAgent after input update: Built-in Explore and Plan agents may only perform read-only operations. Return your findings to the parent agent instead of changing state.</tool_use_error>",
+            is_error: true,
+            tool_use_id: toolUseID
+          }
+        ],
+        sourceToolAssistantUUID: assistantMessage.uuid
+      })
+    });
+    return resultingMessages;
+  }
+  const effectiveCallChanged = callSig !== initiallyValidatedCallSig || finalIsMutating !== isMutating || finalIsTaskListGatedMutation !== isTaskListGatedMutation || finalIsPlanArtifactMutation !== isPlanArtifactMutation;
+  if (finalIsTaskListGatedMutation && !finalIsPlanArtifactMutation) {
+    const finalTaskCounts = await countTasksForGate(toolUseContext);
     const finalGate = checkTaskListGate({
       toolName: tool.name,
-      taskCount: await countTasksForGate(toolUseContext),
+      taskCount: finalTaskCounts?.actionableCount ?? null,
+      totalTaskCount: finalTaskCounts?.totalCount ?? null,
       readsSoFar: countToolCallsBeforeCurrent(toolUseContext.messages, assistantMessage, toolUseID),
       isSubagent: Boolean(toolUseContext.agentId),
-      isMutating: finalIsMutating,
-      isPlanArtifactMutation: finalIsPlanArtifactMutation
+      isMutating: finalIsTaskListGatedMutation,
+      isPlanArtifactMutation: finalIsPlanArtifactMutation,
+      taskPlanningToolName: getTaskPlanningToolName(toolUseContext)
     });
     if (finalGate.allowed === false) {
       recordCallFailure(callSig);
@@ -390693,6 +391147,7 @@ var init_toolExecution = __esm(() => {
   init_cwd2();
   init_permissionLogging();
   init_Tool();
+  init_constants2();
   init_bashPermissions();
   init_prompt2();
   init_prompt3();
@@ -392270,7 +392725,7 @@ function projectStoreFile(cwd2, directory, name, create2) {
   }
   return create2 || existsSync30(target) ? target : undefined;
 }
-function boundedText(text) {
+function boundedText2(text) {
   const normalized = text.trim();
   if (!normalized)
     throw new Error("note text cannot be empty");
@@ -392334,7 +392789,7 @@ function rememberInAutoMemory(memoryDir, text) {
 function remember(cwd2, text) {
   append2(memFile(cwd2, true), {
     ts: new Date().toISOString(),
-    text: boundedText(text),
+    text: boundedText2(text),
     kind: "note"
   });
 }
@@ -392384,7 +392839,7 @@ function forgetInAutoMemory(memoryDir, texts) {
 function addResearch(cwd2, kind, text) {
   append2(researchFile(cwd2, kind, true), {
     ts: new Date().toISOString(),
-    text: boundedText(text),
+    text: boundedText2(text),
     kind
   });
 }
@@ -395688,7 +396143,8 @@ async function createPlanModeAttachmentIfNeeded(context5) {
     reminderType: "full",
     isSubAgent: !!context5.agentId,
     planFilePath,
-    planExists
+    planExists,
+    availablePlanAgentTypes: getAvailableReadOnlyPlanAgentTypes(context5)
   });
 }
 async function createAsyncAgentAttachmentsIfNeeded(context5) {
@@ -397180,21 +397636,6 @@ var init_analyzeContext = __esm(() => {
   init_tokens();
 });
 
-// src/utils/zodToJsonSchema.ts
-function zodToJsonSchema3(schema) {
-  const hit = cache3.get(schema);
-  if (hit)
-    return hit;
-  const result = toJSONSchema(schema);
-  cache3.set(schema, result);
-  return result;
-}
-var cache3;
-var init_zodToJsonSchema2 = __esm(() => {
-  init_v4();
-  cache3 = new WeakMap;
-});
-
 // src/utils/toolSearch.ts
 var exports_toolSearch = {};
 __export(exports_toolSearch, {
@@ -399951,10 +400392,24 @@ async function getPlanModeAttachments(messages, toolUseContext) {
     reminderType,
     isSubAgent: !!toolUseContext.agentId,
     planFilePath,
-    planExists: existingPlan !== null
+    planExists: existingPlan !== null,
+    availablePlanAgentTypes: getAvailableReadOnlyPlanAgentTypes(toolUseContext)
   });
   return attachments;
 }
+function getAvailableReadOnlyPlanAgentTypes(toolUseContext) {
+  const hasAgentTool = toolUseContext.options.tools.some((tool) => toolMatchesName(tool, AGENT_TOOL_NAME));
+  if (!hasAgentTool)
+    return [];
+  try {
+    const definitions = toolUseContext.options.agentDefinitions;
+    const activeAgents = definitions?.activeAgents ?? [];
+    const allowlistedAgents = definitions?.allowedAgentTypes ? activeAgents.filter((agent) => definitions.allowedAgentTypes.includes(agent.agentType)) : activeAgents;
+    return filterDeniedAgents(allowlistedAgents, toolUseContext.getAppState().toolPermissionContext, AGENT_TOOL_NAME).filter((agent) => agent.source === "built-in" && READ_ONLY_PLAN_AGENT_TYPES.has(agent.agentType)).map((agent) => agent.agentType);
+  } catch {
+    return [];
+  }
+}
 async function getPlanModeExitAttachment(toolUseContext) {
   if (!needsPlanModeExitAttachment()) {
     return [];
@@ -408416,6 +408871,12 @@ function getPlanPhase4Section() {
       return PLAN_PHASE4_CONTROL;
   }
 }
+function getAvailablePlanAgentTypes(attachment) {
+  if (attachment.availablePlanAgentTypes !== undefined) {
+    return new Set(attachment.availablePlanAgentTypes);
+  }
+  return areExplorePlanAgentsEnabled() ? new Set([EXPLORE_AGENT.agentType, PLAN_AGENT.agentType]) : new Set;
+}
 function getPlanModeV2Instructions(attachment) {
   if (attachment.isSubAgent) {
     return [];
@@ -408426,26 +408887,21 @@ function getPlanModeV2Instructions(attachment) {
   const agentCount = getPlanModeV2AgentCount();
   const exploreAgentCount = getPlanModeV2ExploreAgentCount();
   const planFileInfo = attachment.planExists ? `A plan file already exists at ${attachment.planFilePath}. You can read it and make incremental edits using the ${FileEditTool.name} tool.` : `No plan file exists yet. You should create your plan at ${attachment.planFilePath} using the ${FileWriteTool.name} tool.`;
-  const content = `Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits (with the exception of the plan file mentioned below), run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received.
-
-## Plan File Info:
-${planFileInfo}
-You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
-
-## Plan Workflow
-
-### Phase 1: Initial Understanding
+  const availablePlanAgents = getAvailablePlanAgentTypes(attachment);
+  const phase1 = availablePlanAgents.has(EXPLORE_AGENT.agentType) ? `### Phase 1: Initial Understanding
 Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions. Critical: In this phase you should only use the ${EXPLORE_AGENT.agentType} subagent type.
 
 1. Focus on understanding the user's request and the code associated with their request. Actively search for existing functions, utilities, and patterns that can be reused \u2014 avoid proposing new code when suitable implementations already exist.
 
 2. **Launch up to ${exploreAgentCount} ${EXPLORE_AGENT.agentType} agents IN PARALLEL** (single message, multiple tool calls) to efficiently explore the codebase.
    - Use 1 agent when the task is isolated to known files, the user provided specific file paths, or you're making a small targeted change.
-   - Use multiple agents when: the scope is uncertain, multiple areas of the codebase are involved, or you need to understand existing patterns before planning.
-   - Quality over quantity - ${exploreAgentCount} agents maximum, but you should try to use the minimum number of agents necessary (usually just 1)
-   - If using multiple agents: Provide each agent with a specific search focus or area to explore. Example: One agent searches for existing implementations, another explores related components, a third investigating testing patterns
+   - Use multiple agents when the scope is uncertain or independent areas need investigation.
+   - Give every agent a distinct search focus; use the minimum number needed.` : `### Phase 1: Initial Understanding
+Goal: Gain a comprehensive understanding of the user's request using the read-only tools that are actually available.
 
-### Phase 2: Design
+1. Focus on the request and associated code. Search for existing functions, utilities, and patterns that can be reused.
+2. Use ${getReadOnlyToolNames()} directly. Batch independent searches and reads in parallel (up to 8 calls per turn), but keep dependent investigation sequential. Do not call a generic Agent as a planning fallback.`;
+  const phase2 = availablePlanAgents.has(PLAN_AGENT.agentType) ? `### Phase 2: Design
 Goal: Design an implementation approach.
 
 Launch ${PLAN_AGENT.agentType} agent(s) to design the implementation based on the user's intent and your exploration results from Phase 1.
@@ -408457,21 +408913,22 @@ You can launch up to ${agentCount} agent(s) in parallel.
 - **Skip agents**: Only for truly trivial tasks (typo fixes, single-line changes, simple renames)
 ${agentCount > 1 ? `- **Multiple agents**: Use up to ${agentCount} agents for complex tasks that benefit from different perspectives
 
-Examples of when to use multiple agents:
-- The task touches multiple parts of the codebase
-- It's a large refactor or architectural change
-- There are many edge cases to consider
-- You'd benefit from exploring different approaches
+Examples: simplicity vs performance, root cause vs prevention, or minimal change vs clean architecture.` : ""}
+In each agent prompt, provide Phase 1 evidence, filenames, code-path traces, requirements, constraints, and the perspective to evaluate.` : `### Phase 2: Design
+Goal: Design the implementation directly from the Phase 1 evidence.
 
-Example perspectives by task type:
-- New feature: simplicity vs performance vs maintainability
-- Bug fix: root cause vs workaround vs prevention
-- Refactoring: minimal change vs clean architecture
-` : ""}
-In the agent prompt:
-- Provide comprehensive background context from Phase 1 exploration including filenames and code path traces
-- Describe requirements and constraints
-- Request a detailed implementation plan
+Compare plausible approaches, choose the smallest approach that fully satisfies the request, identify trade-offs and edge cases, and trace every proposed change to current code. No read-only Plan worker is active, so do not call a generic Agent as a substitute.`;
+  const content = `Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits (with the exception of the plan file mentioned below), run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received.
+
+## Plan File Info:
+${planFileInfo}
+You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
+
+## Plan Workflow
+
+${phase1}
+
+${phase2}
 
 ### Phase 3: Review
 Goal: Review the plan(s) from Phase 2 and ensure alignment with the user's intentions.
@@ -408513,7 +408970,7 @@ You are pair-planning with the user. Explore the code to build context, ask the
 
 Repeat this cycle until the plan is complete:
 
-1. **Explore** \u2014 Use ${getReadOnlyToolNames()} to read code. Look for existing functions, utilities, and patterns to reuse.${areExplorePlanAgentsEnabled() ? ` You can use the ${EXPLORE_AGENT.agentType} agent type to parallelize complex searches without filling your context, though for straightforward queries direct tools are simpler.` : ""}
+1. **Explore** \u2014 Use ${getReadOnlyToolNames()} to read code. Look for existing functions, utilities, and patterns to reuse.${getAvailablePlanAgentTypes(attachment).has(EXPLORE_AGENT.agentType) ? ` You can use the ${EXPLORE_AGENT.agentType} agent type to parallelize complex searches without filling your context, though for straightforward queries direct tools are simpler.` : ""}
 2. **Update the plan file** \u2014 After each discovery, immediately capture what you learned. Don't wait until the end.
 3. **Ask the user** \u2014 When you hit an ambiguity or decision you can't resolve from code alone, use ${ASK_USER_QUESTION_TOOL_NAME}. Then go back to step 1.
 
@@ -408535,6 +408992,7 @@ Your plan file should be divided into clear sections using markdown headers, bas
 - Ensure that the plan file is concise enough to scan quickly, but detailed enough to execute effectively
 - Include the paths of critical files to be modified
 - Reference existing functions and utilities you found that should be reused, with their file paths
+- ${PLAN_TASK_GRAPH_REQUIREMENT}
 - Include a verification section describing how to test the changes end-to-end (run the code, use MCP tools, run tests)
 
 ### When to Converge
@@ -409923,33 +410381,7 @@ Note: The user's next message may contain a correction or preference. Pay close
 `, PLAN_REJECTION_PREFIX = `The agent proposed a plan that was rejected by the user. The user chose to stay in plan mode rather than proceed with implementation.
 
 Rejected plan:
-`, DENIAL_WORKAROUND_GUIDANCE, NO_RESPONSE_REQUESTED = "No response requested.", SYNTHETIC_TOOL_RESULT_PLACEHOLDER = "[Tool result missing due to internal error]", SYNTHETIC_MODEL = "<synthetic>", SYNTHETIC_MESSAGES, EMPTY_LOOKUPS, EMPTY_STRING_SET, STRIPPED_TAGS_RE, PLAN_PHASE4_CONTROL = `### Phase 4: Final Plan
-Goal: Write your final plan to the plan file (the only file you can edit).
-- Begin with a **Context** section: explain why this change is being made \u2014 the problem or need it addresses, what prompted it, and the intended outcome
-- Include only your recommended approach, not all alternatives
-- Ensure that the plan file is concise enough to scan quickly, but detailed enough to execute effectively
-- Include the paths of critical files to be modified
-- Reference existing functions and utilities you found that should be reused, with their file paths
-- Include a verification section describing how to test the changes end-to-end (run the code, use MCP tools, run tests)`, PLAN_PHASE4_TRIM = `### Phase 4: Final Plan
-Goal: Write your final plan to the plan file (the only file you can edit).
-- One-line **Context**: what is being changed and why
-- Include only your recommended approach, not all alternatives
-- List the paths of files to be modified
-- Reference existing functions and utilities to reuse, with their file paths
-- End with **Verification**: the single command to run to confirm the change works (no numbered test procedures)`, PLAN_PHASE4_CUT = `### Phase 4: Final Plan
-Goal: Write your final plan to the plan file (the only file you can edit).
-- Do NOT write a Context or Background section. The user just told you what they want.
-- List the paths of files to be modified and what changes in each (one line per file)
-- Reference existing functions and utilities to reuse, with their file paths
-- End with **Verification**: the single command that confirms the change works
-- Most good plans are under 40 lines. Prose is a sign you are padding.`, PLAN_PHASE4_CAP = `### Phase 4: Final Plan
-Goal: Write your final plan to the plan file (the only file you can edit).
-- Do NOT write a Context, Background, or Overview section. The user just told you what they want.
-- Do NOT restate the user's request. Do NOT write prose paragraphs.
-- List the paths of files to be modified and what changes in each (one bullet per file)
-- Reference existing functions to reuse, with file:line
-- End with the single verification command
-- **Hard limit: 40 lines.** If the plan is longer, delete prose \u2014 not file paths.`;
+`, DENIAL_WORKAROUND_GUIDANCE, NO_RESPONSE_REQUESTED = "No response requested.", SYNTHETIC_TOOL_RESULT_PLACEHOLDER = "[Tool result missing due to internal error]", SYNTHETIC_MODEL = "<synthetic>", SYNTHETIC_MESSAGES, EMPTY_LOOKUPS, EMPTY_STRING_SET, STRIPPED_TAGS_RE, PLAN_PHASE4_CONTROL, PLAN_PHASE4_TRIM, PLAN_PHASE4_CUT, PLAN_PHASE4_CAP;
 var init_messages = __esm(() => {
   init_isObject();
   init_last();
@@ -409980,6 +410412,7 @@ var init_messages = __esm(() => {
   init_prompt();
   init_state();
   init_xml();
+  init_planImplementationContract();
   init_diagnosticTracking();
   init_Tool();
   init_FileReadTool();
@@ -410018,6 +410451,40 @@ var init_messages = __esm(() => {
   };
   EMPTY_STRING_SET = Object.freeze(new Set);
   STRIPPED_TAGS_RE = /<(commit_analysis|context|function_analysis|pr_analysis)>.*?<\/\1>\n?/gs;
+  PLAN_PHASE4_CONTROL = `### Phase 4: Final Plan
+Goal: Write your final plan to the plan file (the only file you can edit).
+- Begin with a **Context** section: explain why this change is being made \u2014 the problem or need it addresses, what prompted it, and the intended outcome
+- Include only your recommended approach, not all alternatives
+- Ensure that the plan file is concise enough to scan quickly, but detailed enough to execute effectively
+- Include the paths of critical files to be modified
+- Reference existing functions and utilities you found that should be reused, with their file paths
+- ${PLAN_TASK_GRAPH_REQUIREMENT}
+- Include a verification section describing how to test the changes end-to-end (run the code, use MCP tools, run tests)`;
+  PLAN_PHASE4_TRIM = `### Phase 4: Final Plan
+Goal: Write your final plan to the plan file (the only file you can edit).
+- One-line **Context**: what is being changed and why
+- Include only your recommended approach, not all alternatives
+- List the paths of files to be modified
+- Reference existing functions and utilities to reuse, with their file paths
+- ${PLAN_TASK_GRAPH_REQUIREMENT}
+- End with **Verification**: the single command to run to confirm the change works (no numbered test procedures)`;
+  PLAN_PHASE4_CUT = `### Phase 4: Final Plan
+Goal: Write your final plan to the plan file (the only file you can edit).
+- Do NOT write a Context or Background section. The user just told you what they want.
+- List the paths of files to be modified and what changes in each (one line per file)
+- Reference existing functions and utilities to reuse, with their file paths
+- ${PLAN_TASK_GRAPH_REQUIREMENT}
+- End with **Verification**: the single command that confirms the change works
+- Most good plans are under 40 lines. Prose is a sign you are padding.`;
+  PLAN_PHASE4_CAP = `### Phase 4: Final Plan
+Goal: Write your final plan to the plan file (the only file you can edit).
+- Do NOT write a Context, Background, or Overview section. The user just told you what they want.
+- Do NOT restate the user's request. Do NOT write prose paragraphs.
+- List the paths of files to be modified and what changes in each (one bullet per file)
+- Reference existing functions to reuse, with file:line
+- ${PLAN_TASK_GRAPH_REQUIREMENT}
+- End with the single verification command
+- **Hard limit: 40 lines.** If the plan is longer, delete prose \u2014 not file paths.`;
 });
 
 // src/services/api/errors.ts
@@ -418035,7 +418502,7 @@ function Feedback({
       platform: env2.platform,
       gitRepo: envInfo.isGit,
       terminal: env2.terminal,
-      version: "1.65.9",
+      version: "1.65.11",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -418227,7 +418694,7 @@ function Feedback({
                       ", ",
                       env2.terminal,
                       ", v",
-                      "1.65.9"
+                      "1.65.11"
                     ]
                   }, undefined, true, undefined, this)
                 ]
@@ -418333,7 +418800,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env2.platform}
 ` + `- Terminal: ${env2.terminal}
-` + `- Version: ${"1.65.9"}
+` + `- Version: ${"1.65.11"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -421443,7 +421910,7 @@ function buildPrimarySection() {
   }, undefined, false, undefined, this);
   return [{
     label: "Version",
-    value: "1.65.9"
+    value: "1.65.11"
   }, {
     label: "Session name",
     value: nameValue
@@ -424773,7 +425240,7 @@ function Config({
         }
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_dev_runtime179.jsxDEV(ChannelDowngradeDialog, {
-      currentVersion: "1.65.9",
+      currentVersion: "1.65.11",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -424785,7 +425252,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "1.65.9";
+          newSettings.minimumVersion = "1.65.11";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -432849,7 +433316,7 @@ function HelpV2(t0) {
   let t6;
   if ($2[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_dev_runtime206.jsxDEV(Tabs, {
-      title: `UR v${"1.65.9"}`,
+      title: `UR v${"1.65.11"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -433782,7 +434249,7 @@ function buildToolUseContext(tools, readFileStateCache, toolPermissionContext, a
 async function handleInitialize(options2) {
   return {
     name: "UR",
-    version: "1.65.9",
+    version: "1.65.11",
     protocolVersion: "0.1.0",
     workspaceRoot: options2.cwd,
     capabilities: {
@@ -450890,7 +451357,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.9") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.11") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -450917,7 +451384,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.9")
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.65.9") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.65.11") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -453783,7 +454250,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version2 = process.env.DEMO_VERSION ?? "1.65.9";
+  const version2 = process.env.DEMO_VERSION ?? "1.65.11";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/ur" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -454650,7 +455117,7 @@ function LogoV2() {
   if ($2[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig2 = getGlobalConfig();
-      if (currentConfig2.lastReleaseNotesSeen === "1.65.9") {
+      if (currentConfig2.lastReleaseNotesSeen === "1.65.11") {
         return;
       }
       saveGlobalConfig(_temp325);
@@ -455335,12 +455802,12 @@ function LogoV2() {
   return t41;
 }
 function _temp325(current) {
-  if (current.lastReleaseNotesSeen === "1.65.9") {
+  if (current.lastReleaseNotesSeen === "1.65.11") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "1.65.9"
+    lastReleaseNotesSeen: "1.65.11"
   };
 }
 function _temp241(s_0) {
@@ -472280,7 +472747,7 @@ function compileAgenticCiWorkflow(specName = "default", options2 = {}) {
   if (spec.name !== specName) {
     throw new Error("Agentic CI workflow spec name does not match");
   }
-  const packageVersion = options2.packageVersion ?? (typeof MACRO !== "undefined" ? "1.65.9" : "1.65.9");
+  const packageVersion = options2.packageVersion ?? (typeof MACRO !== "undefined" ? "1.65.11" : "1.65.11");
   if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(packageVersion)) {
     throw new Error("invalid ur-agent package version");
   }
@@ -473273,7 +473740,7 @@ runner; \`ur trigger\` is the inbound parser that decides what to run.
       path: ".github/workflows/ur.yml",
       root: "project",
       content: compileAgenticCiWorkflow("default", {
-        packageVersion: typeof MACRO !== "undefined" ? "1.65.9" : "1.65.9"
+        packageVersion: typeof MACRO !== "undefined" ? "1.65.11" : "1.65.11"
       })
     },
     {
@@ -473343,7 +473810,7 @@ function value(tokens, flag) {
   return index2 >= 0 ? tokens[index2 + 1] : undefined;
 }
 function cliVersion() {
-  return typeof MACRO !== "undefined" ? "1.65.9" : "1.65.9";
+  return typeof MACRO !== "undefined" ? "1.65.11" : "1.65.11";
 }
 function workflowPath(cwd2) {
   return join159(cwd2, ".github", "workflows", "ur-agentic-ci.yml");
@@ -479208,7 +479675,7 @@ function createAcpStdioApp(deps) {
       }
     },
     authMethods: [],
-    agentInfo: { name: "UR-Nexus", version: "1.65.9" }
+    agentInfo: { name: "UR-Nexus", version: "1.65.11" }
   })).onRequest("authenticate", () => ({})).onRequest("session/new", async (context6) => {
     const result = runtime2.newSession(context6.params.cwd, context6.params.mcpServers, context6.params.additionalDirectories);
     await runtime2.announce({
@@ -479305,7 +479772,7 @@ function createAcpStdioAgent(deps) {
               }
             },
             authMethods: [],
-            agentInfo: { name: "UR-Nexus", version: "1.65.9" }
+            agentInfo: { name: "UR-Nexus", version: "1.65.11" }
           });
           return;
         case "authenticate":
@@ -481817,20 +482284,31 @@ function boundTaskCount(segments) {
     segments.slice(MAX_PLANNED_TASKS - 1).join("; ")
   ];
 }
+function splitDirectiveClauses(prompt) {
+  const normalized = prompt.replace(/\s+and\s+then\s+/gi, " then ");
+  const clauses = normalized.split(/;\s*|(?<=[.!?])\s+(?=[A-Z0-9])|\s+(?=(?:then|also|next|finally)\s+)/i).map(compact2).filter(Boolean);
+  if (clauses.length < 2)
+    return [];
+  const segments = [clauses[0]];
+  for (const clause of clauses.slice(1)) {
+    if (STANDALONE_DIRECTIVE_PATTERN.test(clause)) {
+      segments.push(clause);
+      continue;
+    }
+    const last2 = segments.length - 1;
+    segments[last2] = `${segments[last2]} ${clause}`;
+  }
+  return segments.length >= 2 ? segments : [];
+}
 function splitLongPrompt(prompt) {
   const bulletSegments = splitNumberedOrBulletedLines(prompt);
   if (bulletSegments.length > 0)
     return boundTaskCount(bulletSegments);
   const trimmed = compact2(prompt);
-  if (trimmed.length < 220 && !/[;\n]/.test(prompt))
-    return [trimmed];
   const lines = prompt.split(/\r?\n+/).map(compact2).filter(Boolean);
   if (lines.length >= 2)
     return boundTaskCount(lines);
-  const sentenceSegments = trimmed.split(/(?<=[.!?])\s+(?=[A-Z0-9])/).map(compact2).filter(Boolean);
-  if (sentenceSegments.length >= 2)
-    return boundTaskCount(sentenceSegments);
-  const directiveSegments = trimmed.split(/\s+(?:then|also|next|finally)\s+/i).map(compact2).filter(Boolean);
+  const directiveSegments = splitDirectiveClauses(trimmed);
   return directiveSegments.length >= 2 ? boundTaskCount(directiveSegments) : [trimmed];
 }
 function needsPreviousTask(segment2) {
@@ -481842,10 +482320,12 @@ function needsAllPreviousTasks(segment2, role) {
   return /^(?:finally|once|after\s+(?:all|everything)|when\b.*\b(?:done|complete)|before\s+(?:finishing|completion))\b/i.test(segment2);
 }
 function inferRole(segment2) {
-  if (/\b(plan|analy[sz]e|decompose)\b/i.test(segment2))
+  if (/\b(plan|analy[sz]e|decompose|review|audit|inspect)\b/i.test(segment2)) {
     return "planner";
-  if (/\b(verify|validate|test|check|prove)\b/i.test(segment2))
+  }
+  if (/\b(verify|validate|tests?|testing|checks?|prove)\b/i.test(segment2)) {
     return "verifier";
+  }
   if (/\b(report|summari[sz]e|release notes|changelog)\b/i.test(segment2)) {
     return "reporter";
   }
@@ -481938,7 +482418,7 @@ function verificationCriteria(segment2, files, requiredFiles) {
   }
   return criteria;
 }
-function makeTask(segment2, index2, previousTaskIds, originalPrompt, workspaceRoot) {
+function makeTask(segment2, index2, previousTasks, originalPrompt, workspaceRoot) {
   const files = extractReferencedFiles(segment2);
   const requiredFiles = CREATE_TARGET_PATTERN.test(segment2) ? [] : files;
   const outsidePaths = files.filter((file2) => isOutsideWorkspace(file2, workspaceRoot));
@@ -481949,7 +482429,10 @@ function makeTask(segment2, index2, previousTaskIds, originalPrompt, workspaceRo
   const needsScope = SECURITY_PATTERN.test(segment2) && !AUTHORIZED_SECURITY_PATTERN.test(segment2);
   const needsContext = isCriticallyAmbiguous(segment2);
   const role = inferRole(segment2);
-  const dependencies = needsAllPreviousTasks(segment2, role) ? [...previousTaskIds] : needsPreviousTask(segment2) && previousTaskIds.length > 0 ? [previousTaskIds[previousTaskIds.length - 1]] : [];
+  const previousTaskIds = previousTasks.map((task) => task.id);
+  const previousTask = previousTasks.at(-1);
+  const followsInvestigation = role === "executor" && previousTask?.assignedAgent === "planner";
+  const dependencies = needsAllPreviousTasks(segment2, role) ? [...previousTaskIds] : followsInvestigation ? [previousTask.id] : needsPreviousTask(segment2) && previousTaskIds.length > 0 ? [previousTaskIds[previousTaskIds.length - 1]] : [];
   const assumptions = needsContext ? ["Critical target/context is missing; ask for clarification before execution."] : [
     "Use the current workspace as the source of truth.",
     files.length === 0 ? "No specific files were named; discover relevant files before changing code." : "Only touch referenced files unless repository inspection proves another file is required."
@@ -481987,10 +482470,10 @@ function decomposePrompt(prompt, config3, workspaceRoot) {
   const originalPrompt = prompt;
   const segments = splitLongPrompt(prompt).filter(Boolean);
   const sourceSegments = segments.length > 0 ? segments : [""];
-  const previousTaskIds = [];
+  const previousTasks = [];
   const tasks2 = sourceSegments.map((segment2, index2) => {
-    const task = makeTask(segment2, index2, previousTaskIds, originalPrompt, workspaceRoot);
-    previousTaskIds.push(task.id);
+    const task = makeTask(segment2, index2, previousTasks, originalPrompt, workspaceRoot);
+    previousTasks.push(task);
     return task;
   });
   return {
@@ -482016,7 +482499,7 @@ var init_planner = __esm(() => {
   SECURITY_PATTERN = /\b(pentest|penetration\s+test|exploit|sqlmap|nmap|metasploit|payload|vulnerabilit(?:y|ies)|cve|xss|csrf|rce|security\s+scan|attack)\b/i;
   AUTHORIZED_SECURITY_PATTERN = /\b(authorized|authorization|owned|own\s+system|my\s+(?:app|site|server|service)|localhost|127\.0\.0\.1|::1|lab|sandbox|ctf|test\s+target)\b/i;
   CREATE_TARGET_PATTERN = /\b(?:create|generate|scaffold)\b|^\s*(?:add|write)\s+(?:a|an|new)\b/i;
-  STANDALONE_DIRECTIVE_PATTERN = /^(?:then|after|once|next|finally|before|verify|validate|test|run|create|add|update|fix|implement|build|bump|publish|report|summari[sz]e)\b/i;
+  STANDALONE_DIRECTIVE_PATTERN = /^(?:then|after|once|next|finally|before|verify|validate|test|run|create|add|update|fix|correct|improve|enhance|optimi[sz]e|implement|build|handle|support|document|refactor|remove|rename|migrate|review|audit|inspect|analy[sz]e|bump|publish|report|summari[sz]e)\b/i;
 });
 
 // src/services/promptPlanning/index.ts
@@ -482343,7 +482826,7 @@ function buildExecFinalReport(run3) {
     ]
   };
 }
-function formatList(items, empty, render2) {
+function formatList2(items, empty, render2) {
   return items.length > 0 ? items.map(render2) : [`- ${empty}`];
 }
 function formatApprovalDecision(decision) {
@@ -482370,46 +482853,46 @@ function formatExecFinalReport(report) {
     `Agents used: ${report.activeAgentsUsed} active / ${report.maxAgentsAllowed} max`,
     "",
     "Finished tasks:",
-    ...formatList(report.finishedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
+    ...formatList2(report.finishedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
     "",
     "Failed tasks:",
-    ...formatList(report.failedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
+    ...formatList2(report.failedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
     "",
     "Waiting on prerequisite tasks:",
-    ...formatList(report.blockedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
+    ...formatList2(report.blockedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
     "",
     "Waiting approval/input tasks:",
-    ...formatList(report.waitingApprovalTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
+    ...formatList2(report.waitingApprovalTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
     "",
     "Skipped tasks:",
-    ...formatList(report.skippedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
+    ...formatList2(report.skippedTasks, "none", (task) => `- ${task.id} | ${task.agent} | ${task.title}`),
     "",
     "Actual changed files:",
-    ...formatList(report.actualChangedFiles, "none observed", (file2) => `- ${file2}`),
+    ...formatList2(report.actualChangedFiles, "none observed", (file2) => `- ${file2}`),
     "",
     "Outside-workspace files accessed:",
-    ...formatList(report.outsideWorkspaceFilesAccessed, "none observed", (file2) => `- ${file2}`),
+    ...formatList2(report.outsideWorkspaceFilesAccessed, "none observed", (file2) => `- ${file2}`),
     "",
     "Outside-workspace files modified:",
-    ...formatList(report.outsideWorkspaceFilesModified, "none observed", (file2) => `- ${file2}`),
+    ...formatList2(report.outsideWorkspaceFilesModified, "none observed", (file2) => `- ${file2}`),
     "",
     "Unreported changed files:",
-    ...formatList(report.unreportedChangedFiles, "none", (file2) => `- ${file2}`),
+    ...formatList2(report.unreportedChangedFiles, "none", (file2) => `- ${file2}`),
     "",
     "Verified commands:",
-    ...formatList(report.verifiedCommands, "none observed", (command5) => `- ${command5}`),
+    ...formatList2(report.verifiedCommands, "none observed", (command5) => `- ${command5}`),
     "",
     "Unverified command claims:",
-    ...formatList(report.unverifiedCommandClaims, "none", (command5) => `- ${command5}`),
+    ...formatList2(report.unverifiedCommandClaims, "none", (command5) => `- ${command5}`),
     "",
     "Approval decisions:",
-    ...formatList(report.approvalDecisions, "none", formatApprovalDecision),
+    ...formatList2(report.approvalDecisions, "none", formatApprovalDecision),
     "",
     "Verification failures:",
-    ...formatList(report.verificationFailures, "none", (failure) => `- ${failure.taskId} | ${failure.code} | ${failure.message}`),
+    ...formatList2(report.verificationFailures, "none", (failure) => `- ${failure.taskId} | ${failure.code} | ${failure.message}`),
     "",
     "Warnings:",
-    ...formatList(report.warnings, "none", (warning) => `- ${warning.taskId} | ${warning.code} | ${warning.message}`),
+    ...formatList2(report.warnings, "none", (warning) => `- ${warning.taskId} | ${warning.code} | ${warning.message}`),
     "",
     "Remaining limitations:",
     ...report.remainingLimitations.map((item) => `- ${item}`)
@@ -492411,7 +492894,7 @@ function inferTests(goal) {
 }
 function decomposePrompt2(goal) {
   return [
-    "Decompose the following engineering goal into atomic subtasks.",
+    "Decompose the following engineering goal into cohesive subtasks with observable completion checks.",
     "Return a JSON object with exactly this shape (no markdown, no commentary):",
     "",
     "{",
@@ -492429,7 +492912,9 @@ function decomposePrompt2(goal) {
     "}",
     "",
     "Guidelines:",
-    "- Each subtask should be small enough to implement and verify independently.",
+    "- Use one subtask per cohesive outcome with a clear completion check.",
+    "- Split separately completable deliverables; never hide them in one omnibus task.",
+    "- Return one task when the goal is genuinely atomic. Do not split merely by file, command, tool call, or tiny mechanical step.",
     '- Use "dependsOn" only for real ordering constraints; independent tasks must use an empty array so they can run in parallel.',
     '- "filesTouched" should list the files likely to change.',
     '- "risk" should be high for auth/security/concurrency/destructive changes, medium for refactor/API changes, low for docs/style.',
@@ -676400,7 +676885,7 @@ __export(exports_role_mode, {
 });
 import { existsSync as existsSync94, mkdirSync as mkdirSync65, writeFileSync as writeFileSync65 } from "fs";
 import { join as join212 } from "path";
-function formatList2() {
+function formatList3() {
   const lines = ["Built-in role modes:", ""];
   for (const mode2 of ROLE_MODES) {
     const scope = mode2.tools ? mode2.tools.join(", ") : "all tools";
@@ -676431,7 +676916,7 @@ var call127 = async (args) => {
         })), null, 2)
       };
     }
-    return { type: "text", value: formatList2() };
+    return { type: "text", value: formatList3() };
   }
   if (command5 === "show") {
     const name = positional2[1];
@@ -690447,7 +690932,7 @@ async function captureMemoryDiagnostics(trigger2, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "1.65.9"
+    ccVersion: "1.65.11"
   };
 }
 async function performHeapDump(trigger2 = "manual", dumpNumber = 0) {
@@ -691027,7 +691512,7 @@ var init_bridge_kick = __esm(() => {
 var call153 = async () => {
   return {
     type: "text",
-    value: "1.65.9"
+    value: "1.65.11"
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -702207,7 +702692,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version3 = typeof MACRO !== "undefined" ? "1.65.9" : "unknown";
+  const version3 = typeof MACRO !== "undefined" ? "1.65.11" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h2) => h2.sessionCount > 0).map((h2) => h2.name);
   const facets_summary = {
     total: facets.size,
@@ -706534,7 +707019,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION7 = typeof MACRO !== "undefined" ? "1.65.9" : "unknown";
+  VERSION7 = typeof MACRO !== "undefined" ? "1.65.11" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -707749,7 +708234,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes20(16).toString("hex");
-    return join230(getURTempDir(), "bundled-skills", "1.65.9", nonce);
+    return join230(getURTempDir(), "bundled-skills", "1.65.11", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -713136,7 +713621,7 @@ var CYBER_RISK_INSTRUCTION = `IMPORTANT: Assist with authorized security testing
 
 // src/constants/executionContract.ts
 var EXECUTION_CONTRACT_SECTION = `# Execution contract
-1. Scope: identify outcome, constraints, dependencies. For 3+ steps, record ordered tasks before implementation; ask only unresolved decisions. Task lists are not plan mode: call ExitPlanMode after EnterPlanMode succeeds.
+1. Scope: identify outcome, constraints, dependencies. For 3+ steps, decompose into cohesive, verifiable tasks before implementation; ask only unresolved decisions. Task lists aren't plan mode; ExitPlanMode follows successful EnterPlanMode.
 2. Act: invoke tools through their interface; never substitute printed JSON/XML or commands. Use file tools for edits. Batch independent calls (maximum 8), keep dependencies sequential, inspect every result, update its task, and never emit an empty turn.
 3. Recover: read exact failures; change input, assumptions, or approach. Never repeat an unchanged failure unless external state changed. After three failures on one approach, switch strategy or report the blocker. Distinguish DNS/TLS/auth/rate-limit failures; report external-tool errors honestly.
 4. Verify: run the smallest checks, broader when risk warrants. Match completion claims to successful tool results and observed evidence; state skipped or failing checks.
@@ -713148,21 +713633,26 @@ function getTaskToolGuidance(enabledTools) {
   const canCreate = enabledTools.has(TASK_CREATE_TOOL_NAME);
   const canUpdate = enabledTools.has(TASK_UPDATE_TOOL_NAME);
   const canList = enabledTools.has(TASK_LIST_TOOL_NAME);
+  const canDelegate = enabledTools.has(AGENT_TOOL_NAME);
+  const decomposition = "For non-trivial work, use one task per cohesive outcome with its own observable done check; never hide separately completable deliverables in one omnibus task. Keep genuinely atomic work as one task\u2014do not split by file, tool call, or tiny mechanical step. Make real dependencies explicit and leave unrelated tasks unblocked.";
+  const parallel = canDelegate ? ` If delegating, launch mutually independent tasks through ${AGENT_TOOL_NAME} in parallel only when they have no conflicting shared mutations; keep dependent or conflicting work sequential.` : "";
   if (canCreate && canUpdate) {
-    return `Track multi-step work with ${TASK_CREATE_TOOL_NAME} and ${TASK_UPDATE_TOOL_NAME}: create dependency-ordered tasks for the concrete outcomes before implementation; mark one unblocked task in_progress when starting it; mark it completed immediately after implementation and relevant verification succeed; leave blocked or partial work open with its blocker recorded.${canList ? ` Use ${TASK_LIST_TOOL_NAME} to select the next unblocked task.` : ""}`;
+    return `Track multi-step work with ${TASK_CREATE_TOOL_NAME} and ${TASK_UPDATE_TOOL_NAME}. ${decomposition}${parallel} Create the complete dependency graph before implementation; mark each task in_progress when its work starts and completed immediately after its implementation and relevant verification succeed; leave blocked or partial work open with its blocker recorded.${canList ? ` Use ${TASK_LIST_TOOL_NAME} to select the next unblocked task.` : ""}`;
   }
   if (canUpdate) {
     return `Keep assigned tasks current with ${TASK_UPDATE_TOOL_NAME}: mark the task in_progress when starting, completed only after implementation and relevant verification succeed, and leave blocked or partial work open with its blocker recorded.${canList ? ` Use ${TASK_LIST_TOOL_NAME} to select the next unblocked task.` : ""}`;
   }
   if (canCreate) {
-    return `For multi-step work, use ${TASK_CREATE_TOOL_NAME} before implementation to record concrete outcomes and their dependency order.`;
+    return `For multi-step work, use ${TASK_CREATE_TOOL_NAME} before implementation. ${decomposition}${parallel}`;
   }
   if (enabledTools.has(TODO_WRITE_TOOL_NAME)) {
-    return `Track multi-step work with ${TODO_WRITE_TOOL_NAME}. Keep items dependency-ordered and mark each item completed immediately after its implementation and relevant verification succeed.`;
+    return `Track multi-step work with ${TODO_WRITE_TOOL_NAME}. ${decomposition} Keep items dependency-ordered and mark each item completed immediately after its implementation and relevant verification succeed.`;
   }
   return null;
 }
-var init_taskToolGuidance = () => {};
+var init_taskToolGuidance = __esm(() => {
+  init_constants2();
+});
 
 // src/constants/prompts.ts
 import { type as osType2, version as osVersion, release as osRelease2 } from "os";
@@ -714072,7 +714562,7 @@ function computeFingerprint(messageText2, version3) {
 }
 function computeFingerprintFromMessages(messages) {
   const firstMessageText = extractFirstMessageText(messages);
-  return computeFingerprint(firstMessageText, "1.65.9");
+  return computeFingerprint(firstMessageText, "1.65.11");
 }
 var FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = () => {};
@@ -715968,7 +716458,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText2 = extractFirstUserMessageText(messages);
-  const fingerprint2 = computeFingerprint(messageText2, "1.65.9");
+  const fingerprint2 = computeFingerprint(messageText2, "1.65.11");
   const attributionHeader = getAttributionHeader(fingerprint2);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -720755,7 +721245,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c4) => c4.userInvocable !== false).map((c4) => c4.name),
     apiKeySource: getURHQApiKeyWithSource().source,
     betas: getSdkBetas(),
-    ur_version: "1.65.9",
+    ur_version: "1.65.11",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent2) => agent2.agentType),
     skills: inputs.skills.filter((s) => s.userInvocable !== false).map((skill2) => skill2.name),
@@ -721936,6 +722426,29 @@ var init_useNotifyAfterTimeout = __esm(() => {
   import_react196 = __toESM(require_react(), 1);
 });
 
+// src/components/permissions/AskUserQuestionPermissionRequest/prototypeSafeRecord.ts
+function createPrototypeSafeRecord() {
+  return Object.create(null);
+}
+function clonePrototypeSafeRecord(source) {
+  return Object.assign(Object.create(null), source);
+}
+function hasOwnRecordKey(record4, key) {
+  return record4 !== null && record4 !== undefined && hasOwn2.call(record4, key);
+}
+function getOwnRecordValue(record4, key) {
+  return hasOwnRecordKey(record4, key) ? record4[key] : undefined;
+}
+function setPrototypeSafeRecordValue(record4, key, value2) {
+  const next = Object.assign(createPrototypeSafeRecord(), record4);
+  next[key] = value2;
+  return next;
+}
+var hasOwn2;
+var init_prototypeSafeRecord = __esm(() => {
+  hasOwn2 = Object.prototype.hasOwnProperty;
+});
+
 // src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
 function QuestionNavigationBar(t0) {
   const $2 = import_compiler_runtime262.c(39);
@@ -722043,7 +722556,7 @@ function QuestionNavigationBar(t0) {
     if ($2[22] !== answers || $2[23] !== currentQuestionIndex || $2[24] !== tabDisplayTexts) {
       t52 = (q_1, index_2) => {
         const isSelected = index_2 === currentQuestionIndex;
-        const isAnswered = q_1?.question && !!answers[q_1.question];
+        const isAnswered = q_1?.question && !!getOwnRecordValue(answers, q_1.question);
         const checkbox = isAnswered ? figures_default.checkboxOn : figures_default.checkboxOff;
         const displayText = tabDisplayTexts[index_2] || q_1?.header || `Q${index_2 + 1}`;
         return /* @__PURE__ */ jsx_dev_runtime357.jsxDEV(ThemedBox_default, {
@@ -722165,6 +722678,7 @@ var init_QuestionNavigationBar = __esm(() => {
   init_stringWidth();
   init_ink2();
   init_format2();
+  init_prototypeSafeRecord();
   import_compiler_runtime262 = __toESM(require_compiler_runtime(), 1);
   jsx_dev_runtime357 = __toESM(require_jsx_dev_runtime(), 1);
 });
@@ -722465,20 +722979,34 @@ function PreviewQuestionView({
   const editor = getExternalEditor();
   const editorName = editor ? toIDEDisplayName(editor) : null;
   const questionText = question.question;
-  const questionState = questionStates[questionText];
+  const questionState = getOwnRecordValue(questionStates, questionText);
   const allOptions = question.options;
+  const otherIndex = allOptions.length;
+  const optionRowCount = allOptions.length + 1;
   const [focusedIndex, setFocusedIndex] = import_react198.useState(0);
   const prevQuestionText = import_react198.useRef(questionText);
   if (prevQuestionText.current !== questionText) {
     prevQuestionText.current = questionText;
     const selected = questionState?.selectedValue;
-    const idx = selected ? allOptions.findIndex((opt) => opt.label === selected) : -1;
+    const idx = selected === PREVIEW_OTHER_VALUE ? otherIndex : selected ? allOptions.findIndex((opt) => opt.label === selected) : -1;
     setFocusedIndex(idx >= 0 ? idx : 0);
   }
   const focusedOption = allOptions[focusedIndex];
+  const isOtherFocused = focusedIndex === otherIndex;
   const selectedValue = questionState?.selectedValue;
   const notesValue = questionState?.textInputValue || "";
+  const otherInputValue = questionState?.otherInputValue || "";
   const handleSelectOption = import_react198.useCallback((index2) => {
+    if (index2 === otherIndex) {
+      setFocusedIndex(index2);
+      onUpdateQuestionState(questionText, {
+        selectedValue: PREVIEW_OTHER_VALUE
+      }, false);
+      onAnswer(questionText, PREVIEW_OTHER_VALUE, "", false);
+      setIsInNotesInput(true);
+      onTextInputFocus(true);
+      return;
+    }
     const option27 = allOptions[index2];
     if (!option27)
       return;
@@ -722487,7 +723015,7 @@ function PreviewQuestionView({
       selectedValue: option27.label
     }, false);
     onAnswer(questionText, option27.label);
-  }, [allOptions, questionText, onUpdateQuestionState, onAnswer]);
+  }, [allOptions, otherIndex, questionText, onUpdateQuestionState, onAnswer, onTextInputFocus]);
   const handleNavigate = import_react198.useCallback((direction) => {
     if (isInNotesInput)
       return;
@@ -722497,18 +723025,18 @@ function PreviewQuestionView({
     } else if (direction === "up") {
       newIndex = focusedIndex > 0 ? focusedIndex - 1 : focusedIndex;
     } else {
-      newIndex = focusedIndex < allOptions.length - 1 ? focusedIndex + 1 : focusedIndex;
+      newIndex = focusedIndex < optionRowCount - 1 ? focusedIndex + 1 : focusedIndex;
     }
-    if (newIndex >= 0 && newIndex < allOptions.length) {
+    if (newIndex >= 0 && newIndex < optionRowCount) {
       setFocusedIndex(newIndex);
     }
-  }, [focusedIndex, allOptions.length, isInNotesInput]);
+  }, [focusedIndex, optionRowCount, isInNotesInput]);
   useKeybinding("chat:externalEditor", async () => {
-    const currentValue = questionState?.textInputValue || "";
+    const currentValue = isOtherFocused ? otherInputValue : notesValue;
     const result = await editPromptInEditor(currentValue);
     if (result.content !== null && result.content !== currentValue) {
       onUpdateQuestionState(questionText, {
-        textInputValue: result.content
+        ...isOtherFocused ? { otherInputValue: result.content } : { textInputValue: result.content }
       }, false);
     }
   }, {
@@ -722525,10 +723053,17 @@ function PreviewQuestionView({
   const handleNotesExit = import_react198.useCallback(() => {
     setIsInNotesInput(false);
     onTextInputFocus(false);
-    if (selectedValue) {
+    if (isOtherFocused) {
+      const customAnswer = otherInputValue.trim();
+      if (customAnswer) {
+        onAnswer(questionText, PREVIEW_OTHER_VALUE, customAnswer);
+      }
+      return;
+    }
+    if (selectedValue && selectedValue !== PREVIEW_OTHER_VALUE) {
       onAnswer(questionText, selectedValue);
     }
-  }, [selectedValue, questionText, onAnswer, onTextInputFocus]);
+  }, [isOtherFocused, otherInputValue, selectedValue, questionText, onAnswer, onTextInputFocus]);
   const handleDownFromPreview = import_react198.useCallback(() => {
     setIsFooterFocused(true);
   }, []);
@@ -722582,7 +723117,7 @@ function PreviewQuestionView({
       }
     } else if (e.key === "down" || e.ctrl && e.key === "n") {
       e.preventDefault();
-      if (focusedIndex === allOptions.length - 1) {
+      if (focusedIndex === optionRowCount - 1) {
         handleDownFromPreview();
       } else {
         handleNavigate("down");
@@ -722592,6 +723127,11 @@ function PreviewQuestionView({
       handleSelectOption(focusedIndex);
     } else if (e.key === "n" && !e.ctrl && !e.meta) {
       e.preventDefault();
+      if (isOtherFocused && selectedValue !== PREVIEW_OTHER_VALUE) {
+        onUpdateQuestionState(questionText, {
+          selectedValue: PREVIEW_OTHER_VALUE
+        }, false);
+      }
       setIsInNotesInput(true);
       onTextInputFocus(true);
     } else if (e.key === "escape") {
@@ -722600,12 +723140,13 @@ function PreviewQuestionView({
     } else if (e.key.length === 1 && e.key >= "1" && e.key <= "9") {
       e.preventDefault();
       const idx_0 = parseInt(e.key, 10) - 1;
-      if (idx_0 < allOptions.length) {
+      if (idx_0 < optionRowCount) {
         handleNavigate(idx_0);
       }
     }
-  }, [isFooterFocused, footerIndex, isInPlanMode, isInNotesInput, focusedIndex, allOptions.length, handleUpFromFooter, handleDownFromPreview, handleNavigate, handleSelectOption, handleNotesExit, onRespondToUR, onFinishPlanInterview, onCancel, onTextInputFocus]);
-  const previewContent = focusedOption?.preview || null;
+  }, [isFooterFocused, footerIndex, isInPlanMode, isInNotesInput, focusedIndex, optionRowCount, isOtherFocused, selectedValue, questionText, handleUpFromFooter, handleDownFromPreview, handleNavigate, handleSelectOption, handleNotesExit, onRespondToUR, onFinishPlanInterview, onCancel, onTextInputFocus, onUpdateQuestionState]);
+  const previewContent = isOtherFocused ? "Enter a custom answer below." : focusedOption?.preview || null;
+  const currentInputValue = isOtherFocused ? otherInputValue : notesValue;
   const LEFT_PANEL_WIDTH = 30;
   const GAP = 4;
   const {
@@ -722644,13 +723185,49 @@ function PreviewQuestionView({
                 /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedBox_default, {
                   flexDirection: "column",
                   width: 30,
-                  children: allOptions.map((option_0, index_0) => {
-                    const isFocused = focusedIndex === index_0;
-                    const isSelected = selectedValue === option_0.label;
-                    return /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedBox_default, {
+                  children: [
+                    allOptions.map((option_0, index_0) => {
+                      const isFocused = focusedIndex === index_0;
+                      const isSelected = selectedValue === option_0.label;
+                      return /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedBox_default, {
+                        flexDirection: "row",
+                        children: [
+                          isFocused ? /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                            color: "suggestion",
+                            children: figures_default.pointer
+                          }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                            children: " "
+                          }, undefined, false, undefined, this),
+                          /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                            dimColor: true,
+                            children: [
+                              " ",
+                              index_0 + 1,
+                              "."
+                            ]
+                          }, undefined, true, undefined, this),
+                          /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                            color: isSelected ? "success" : isFocused ? "suggestion" : undefined,
+                            bold: isFocused,
+                            children: [
+                              " ",
+                              option_0.label
+                            ]
+                          }, undefined, true, undefined, this),
+                          isSelected && /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                            color: "success",
+                            children: [
+                              " ",
+                              figures_default.tick
+                            ]
+                          }, undefined, true, undefined, this)
+                        ]
+                      }, option_0.label, true, undefined, this);
+                    }),
+                    /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedBox_default, {
                       flexDirection: "row",
                       children: [
-                        isFocused ? /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                        isOtherFocused ? /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
                           color: "suggestion",
                           children: figures_default.pointer
                         }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
@@ -722660,19 +723237,19 @@ function PreviewQuestionView({
                           dimColor: true,
                           children: [
                             " ",
-                            index_0 + 1,
+                            otherIndex + 1,
                             "."
                           ]
                         }, undefined, true, undefined, this),
                         /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
-                          color: isSelected ? "success" : isFocused ? "suggestion" : undefined,
-                          bold: isFocused,
+                          color: selectedValue === PREVIEW_OTHER_VALUE ? "success" : isOtherFocused ? "suggestion" : undefined,
+                          bold: isOtherFocused,
                           children: [
                             " ",
-                            option_0.label
+                            "Other"
                           ]
                         }, undefined, true, undefined, this),
-                        isSelected && /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
+                        selectedValue === PREVIEW_OTHER_VALUE && /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
                           color: "success",
                           children: [
                             " ",
@@ -722680,9 +723257,9 @@ function PreviewQuestionView({
                           ]
                         }, undefined, true, undefined, this)
                       ]
-                    }, option_0.label, true, undefined, this);
-                  })
-                }, undefined, false, undefined, this),
+                    }, PREVIEW_OTHER_VALUE, true, undefined, this)
+                  ]
+                }, undefined, true, undefined, this),
                 /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedBox_default, {
                   flexDirection: "column",
                   flexGrow: 1,
@@ -722700,14 +723277,14 @@ function PreviewQuestionView({
                       children: [
                         /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
                           color: "suggestion",
-                          children: "Notes:"
+                          children: isOtherFocused ? "Answer:" : "Notes:"
                         }, undefined, false, undefined, this),
                         isInNotesInput ? /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(TextInput, {
-                          value: notesValue,
-                          placeholder: "Add notes on this design\u2026",
+                          value: currentInputValue,
+                          placeholder: isOtherFocused ? "Type a custom answer\u2026" : "Add notes on this design\u2026",
                           onChange: (value2) => {
                             onUpdateQuestionState(questionText, {
-                              textInputValue: value2
+                              ...isOtherFocused ? { otherInputValue: value2 } : { textInputValue: value2 }
                             }, false);
                           },
                           onSubmit: handleNotesExit,
@@ -722720,7 +723297,7 @@ function PreviewQuestionView({
                         }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(ThemedText, {
                           dimColor: true,
                           italic: true,
-                          children: notesValue || "press n to add notes"
+                          children: currentInputValue || (isOtherFocused ? "press Enter to type a custom answer" : "press n to add notes")
                         }, undefined, false, undefined, this)
                       ]
                     }, undefined, true, undefined, this)
@@ -722779,7 +723356,8 @@ function PreviewQuestionView({
                   figures_default.arrowUp,
                   "/",
                   figures_default.arrowDown,
-                  " to navigate \xB7 n to add notes",
+                  " to navigate \xB7 n to edit ",
+                  isOtherFocused ? "answer" : "notes",
                   questions.length > 1 && /* @__PURE__ */ jsx_dev_runtime359.jsxDEV(jsx_dev_runtime359.Fragment, {
                     children: " \xB7 Tab to switch questions"
                   }, undefined, false, undefined, this),
@@ -722800,7 +723378,7 @@ function PreviewQuestionView({
     }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
-var import_react198, jsx_dev_runtime359;
+var import_react198, jsx_dev_runtime359, PREVIEW_OTHER_VALUE = "__other__";
 var init_PreviewQuestionView = __esm(() => {
   init_figures();
   init_useTerminalSize();
@@ -722813,6 +723391,7 @@ var init_PreviewQuestionView = __esm(() => {
   init_Divider();
   init_TextInput();
   init_PreviewBox();
+  init_prototypeSafeRecord();
   init_QuestionNavigationBar();
   import_react198 = __toESM(require_react(), 1);
   jsx_dev_runtime359 = __toESM(require_jsx_dev_runtime(), 1);
@@ -722846,6 +723425,7 @@ function QuestionView({
   const [isFooterFocused, setIsFooterFocused] = import_react199.useState(false);
   const [footerIndex, setFooterIndex] = import_react199.useState(0);
   const [isOtherFocused, setIsOtherFocused] = import_react199.useState(false);
+  const questionState = getOwnRecordValue(questionStates, question.question);
   const editorName = import_react199.useMemo(() => {
     const editor = getExternalEditor();
     return editor ? toIDEDisplayName(editor) : null;
@@ -722909,7 +723489,7 @@ function QuestionView({
       }
     };
     const placeholder = question.multiSelect ? "Type something" : "Type something.";
-    const textInputValue = questionStates[question.question]?.textInputValue ?? "";
+    const textInputValue = questionState?.textInputValue ?? "";
     return [
       ...textOptions,
       {
@@ -722924,7 +723504,7 @@ function QuestionView({
         onOpenEditor: handleOpenEditor
       }
     ];
-  }, [question, questionStates, onUpdateQuestionState]);
+  }, [question, questionState, onUpdateQuestionState]);
   const hasAnyPreview = !question.multiSelect && question.options.some((opt) => opt.preview);
   if (hasAnyPreview) {
     return /* @__PURE__ */ jsx_dev_runtime360.jsxDEV(PreviewQuestionView, {
@@ -722987,10 +723567,10 @@ function QuestionView({
             marginTop: 1,
             children: question.multiSelect ? /* @__PURE__ */ jsx_dev_runtime360.jsxDEV(SelectMulti, {
               options: options4,
-              defaultValue: questionStates[question.question]?.selectedValue,
+              defaultValue: questionState?.selectedValue,
               onChange: (values2) => {
                 onUpdateQuestionState(question.question, { selectedValue: values2 }, true);
-                const textInput = values2.includes("__other__") ? questionStates[question.question]?.textInputValue : undefined;
+                const textInput = values2.includes("__other__") ? questionState?.textInputValue : undefined;
                 const finalValues = values2.filter((v) => v !== "__other__").concat(textInput ? [textInput] : []);
                 onAnswer(question.question, finalValues, undefined, false);
               },
@@ -723005,10 +723585,10 @@ function QuestionView({
               onRemoveImage
             }, question.question, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime360.jsxDEV(Select, {
               options: options4,
-              defaultValue: questionStates[question.question]?.selectedValue,
+              defaultValue: questionState?.selectedValue,
               onChange: (value2) => {
                 onUpdateQuestionState(question.question, { selectedValue: value2 }, false);
-                const textInput = value2 === "__other__" ? questionStates[question.question]?.textInputValue : undefined;
+                const textInput = value2 === "__other__" ? questionState?.textInputValue : undefined;
                 onAnswer(question.question, value2, textInput);
               },
               onFocus: handleFocus,
@@ -723112,6 +723692,7 @@ var init_QuestionView = __esm(() => {
   init_FilePathLink();
   init_QuestionNavigationBar();
   init_PreviewQuestionView();
+  init_prototypeSafeRecord();
   import_react199 = __toESM(require_react(), 1);
   jsx_dev_runtime360 = __toESM(require_jsx_dev_runtime(), 1);
 });
@@ -723283,8 +723864,8 @@ function SubmitQuestionsView({
               Object.keys(answers).length > 0 && /* @__PURE__ */ jsx_dev_runtime362.jsxDEV(ThemedBox_default, {
                 flexDirection: "column",
                 marginBottom: 1,
-                children: questions.filter((q) => q?.question && answers[q.question]).map((q) => {
-                  const answer = answers[q.question];
+                children: questions.filter((q) => q?.question && getOwnRecordValue(answers, q.question)).map((q) => {
+                  const answer = getOwnRecordValue(answers, q.question);
                   return /* @__PURE__ */ jsx_dev_runtime362.jsxDEV(ThemedBox_default, {
                     flexDirection: "column",
                     marginLeft: 1,
@@ -723341,12 +723922,13 @@ var init_SubmitQuestionsView = __esm(() => {
   init_CustomSelect();
   init_Divider();
   init_PermissionRuleExplanation();
+  init_prototypeSafeRecord();
   init_QuestionNavigationBar();
   jsx_dev_runtime362 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/components/permissions/AskUserQuestionPermissionRequest/use-multiple-choice-state.ts
-function reducer2(state2, action3) {
+function multipleChoiceReducer(state2, action3) {
   switch (action3.type) {
     case "next-question":
       return {
@@ -723361,26 +723943,21 @@ function reducer2(state2, action3) {
         isInTextInput: false
       };
     case "update-question-state": {
-      const existing2 = state2.questionStates[action3.questionText];
+      const existing2 = getOwnRecordValue(state2.questionStates, action3.questionText);
       const newState = {
         selectedValue: action3.updates.selectedValue ?? existing2?.selectedValue ?? (action3.isMultiSelect ? [] : undefined),
-        textInputValue: action3.updates.textInputValue ?? existing2?.textInputValue ?? ""
+        textInputValue: action3.updates.textInputValue ?? existing2?.textInputValue ?? "",
+        otherInputValue: action3.updates.otherInputValue ?? existing2?.otherInputValue ?? ""
       };
       return {
         ...state2,
-        questionStates: {
-          ...state2.questionStates,
-          [action3.questionText]: newState
-        }
+        questionStates: setPrototypeSafeRecordValue(state2.questionStates, action3.questionText, newState)
       };
     }
     case "set-answer": {
       const newState = {
         ...state2,
-        answers: {
-          ...state2.answers,
-          [action3.questionText]: action3.answer
-        }
+        answers: setPrototypeSafeRecordValue(state2.answers, action3.questionText, action3.answer)
       };
       if (action3.shouldAdvance) {
         return {
@@ -723398,8 +723975,16 @@ function reducer2(state2, action3) {
       };
   }
 }
+function createInitialMultipleChoiceState() {
+  return {
+    currentQuestionIndex: 0,
+    answers: createPrototypeSafeRecord(),
+    questionStates: createPrototypeSafeRecord(),
+    isInTextInput: false
+  };
+}
 function useMultipleChoiceState() {
-  const [state2, dispatch5] = import_react200.useReducer(reducer2, INITIAL_STATE2);
+  const [state2, dispatch5] = import_react200.useReducer(multipleChoiceReducer, createInitialMultipleChoiceState());
   const nextQuestion = import_react200.useCallback(() => {
     dispatch5({ type: "next-question" });
   }, []);
@@ -723437,18 +724022,22 @@ function useMultipleChoiceState() {
     setTextInputMode
   };
 }
-var import_react200, INITIAL_STATE2;
+var import_react200;
 var init_use_multiple_choice_state = __esm(() => {
+  init_prototypeSafeRecord();
   import_react200 = __toESM(require_react(), 1);
-  INITIAL_STATE2 = {
-    currentQuestionIndex: 0,
-    answers: {},
-    questionStates: {},
-    isInTextInput: false
-  };
 });
 
 // src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
+function resolveQuestionAnswer(label, textInput, hasImages) {
+  if (Array.isArray(label))
+    return label.join(", ");
+  if (textInput)
+    return hasImages ? `${textInput} (Image attached)` : textInput;
+  if (label === "__other__")
+    return hasImages ? "(Image attached)" : "";
+  return label;
+}
 function AskUserQuestionPermissionRequest(props) {
   const settings = useSettings();
   if (settings.syntaxHighlightingDisabled) {
@@ -723511,7 +724100,7 @@ function AskUserQuestionPermissionRequestBody({
         }
       }
       const rightPanelHeight = maxPreviewBoxHeight + 2;
-      const leftPanelHeight = q.options.length + 2;
+      const leftPanelHeight = q.options.length + 3;
       const sideByHeight = Math.max(leftPanelHeight, rightPanelHeight);
       maxHeight = Math.max(maxHeight, sideByHeight + 7);
     } else {
@@ -723520,7 +724109,7 @@ function AskUserQuestionPermissionRequestBody({
   }
   const globalContentHeight = Math.min(Math.max(maxHeight, MIN_CONTENT_HEIGHT), maxAllowedHeight);
   const globalContentWidth = Math.max(maxWidth, MIN_CONTENT_WIDTH);
-  const [pastedContentsByQuestion, setPastedContentsByQuestion] = import_react201.useState({});
+  const [pastedContentsByQuestion, setPastedContentsByQuestion] = import_react201.useState(() => createPrototypeSafeRecord());
   const nextPasteIdRef = import_react201.useRef(0);
   const onImagePaste = import_react201.useCallback((questionText, base64Image, mediaType, filename, dimensions, _sourcePath) => {
     nextPasteIdRef.current += 1;
@@ -723535,22 +724124,19 @@ function AskUserQuestionPermissionRequestBody({
     };
     cacheImagePath(newContent);
     storeImage(newContent);
-    setPastedContentsByQuestion((prev) => ({
-      ...prev,
-      [questionText]: {
-        ...prev[questionText] ?? {},
-        [pasteId]: newContent
-      }
-    }));
+    setPastedContentsByQuestion((prev) => {
+      const previousQuestionContents = getOwnRecordValue(prev, questionText);
+      const questionContents = previousQuestionContents ? clonePrototypeSafeRecord(previousQuestionContents) : Object.create(null);
+      questionContents[pasteId] = newContent;
+      return setPrototypeSafeRecordValue(prev, questionText, questionContents);
+    });
   }, []);
   const onRemoveImage = import_react201.useCallback((questionText, id) => {
     setPastedContentsByQuestion((prev) => {
-      const questionContents = { ...prev[questionText] ?? {} };
+      const previousQuestionContents = getOwnRecordValue(prev, questionText);
+      const questionContents = previousQuestionContents ? clonePrototypeSafeRecord(previousQuestionContents) : Object.create(null);
       delete questionContents[id];
-      return {
-        ...prev,
-        [questionText]: questionContents
-      };
+      return setPrototypeSafeRecordValue(prev, questionText, questionContents);
     });
   }, []);
   const allImageAttachments = import_react201.useMemo(() => Object.values(pastedContentsByQuestion).flatMap(Object.values).filter((c4) => c4.type === "image"), [pastedContentsByQuestion]);
@@ -723568,7 +724154,7 @@ function AskUserQuestionPermissionRequestBody({
   } = state2;
   const currentQuestion = currentQuestionIndex < (questions?.length || 0) ? questions?.[currentQuestionIndex] : null;
   const isInSubmitView = currentQuestionIndex === (questions?.length || 0);
-  const allQuestionsAnswered = questions?.every((q) => q?.question && !!answers[q.question]) ?? false;
+  const allQuestionsAnswered = questions?.every((q) => q?.question && !!getOwnRecordValue(answers, q.question)) ?? false;
   const hideSubmitTab = questions.length === 1 && !questions[0]?.multiSelect;
   const handleCancel = import_react201.useCallback(() => {
     if (metadataSource) {
@@ -723585,7 +724171,7 @@ function AskUserQuestionPermissionRequestBody({
   }, [metadataSource, questions.length, isInPlanMode, onDone, onReject, toolUseConfirm]);
   const handleRespondToUR = import_react201.useCallback(async () => {
     const questionsWithAnswers = questions.map((q) => {
-      const answer = answers[q.question];
+      const answer = getOwnRecordValue(answers, q.question);
       if (answer) {
         return `- "${q.question}"
   Answer: ${answer}`;
@@ -723615,7 +724201,7 @@ ${questionsWithAnswers}`;
   }, [allImageAttachments, answers, isInPlanMode, metadataSource, onDone, questions, toolUseConfirm]);
   const handleFinishPlanInterview = import_react201.useCallback(async () => {
     const questionsWithAnswers = questions.map((q) => {
-      const answer = answers[q.question];
+      const answer = getOwnRecordValue(answers, q.question);
       if (answer) {
         return `- "${q.question}"
   Answer: ${answer}`;
@@ -723651,10 +724237,13 @@ ${questionsWithAnswers}`;
         interviewPhaseEnabled: isInPlanMode && isPlanModeInterviewPhaseEnabled()
       });
     }
-    const annotations = {};
+    const annotations = createPrototypeSafeRecord();
     for (const q of questions) {
-      const answer = answersToSubmit[q.question];
-      const notes = questionStates[q.question]?.textInputValue;
+      const answer = getOwnRecordValue(answersToSubmit, q.question);
+      const questionState = getOwnRecordValue(questionStates, q.question);
+      const selectedValue = questionState?.selectedValue;
+      const selectedOther = selectedValue === "__other__" || Array.isArray(selectedValue) && selectedValue.includes("__other__");
+      const notes = selectedOther ? undefined : questionState?.textInputValue;
       const selectedOption = answer ? q.options.find((opt) => opt.label === answer) : undefined;
       const preview6 = selectedOption?.preview;
       if (preview6 || notes?.trim()) {
@@ -723675,21 +724264,11 @@ ${questionsWithAnswers}`;
   }, [allImageAttachments, isInPlanMode, metadataSource, onDone, questionStates, questions, toolUseConfirm]);
   const handleQuestionAnswer = import_react201.useCallback((questionText, label, textInput, shouldAdvance = true) => {
     const isMultiSelect = Array.isArray(label);
-    let answer;
-    if (isMultiSelect) {
-      answer = label.join(", ");
-    } else if (textInput) {
-      const questionImages = Object.values(pastedContentsByQuestion[questionText] ?? {}).filter((c4) => c4.type === "image");
-      answer = questionImages.length > 0 ? `${textInput} (Image attached)` : textInput;
-    } else if (label === "__other__") {
-      const questionImages = Object.values(pastedContentsByQuestion[questionText] ?? {}).filter((c4) => c4.type === "image");
-      answer = questionImages.length > 0 ? "(Image attached)" : label;
-    } else {
-      answer = label;
-    }
+    const hasImages = Object.values(getOwnRecordValue(pastedContentsByQuestion, questionText) ?? {}).some((content) => content.type === "image");
+    const answer = resolveQuestionAnswer(label, textInput, hasImages);
     const isSingleQuestion = questions.length === 1;
-    if (!isMultiSelect && isSingleQuestion && shouldAdvance) {
-      const updatedAnswers = { ...answers, [questionText]: answer };
+    if (!isMultiSelect && isSingleQuestion && shouldAdvance && answer) {
+      const updatedAnswers = setPrototypeSafeRecordValue(answers, questionText, answer);
       submitAnswers(updatedAnswers).catch(logError2);
       return;
     }
@@ -723723,7 +724302,7 @@ ${questionsWithAnswers}`;
     isActive: !(isInTextInput && !isInSubmitView)
   });
   if (currentQuestion) {
-    const pastedContents = pastedContentsByQuestion[currentQuestion.question] ?? {};
+    const pastedContents = getOwnRecordValue(pastedContentsByQuestion, currentQuestion.question) ?? Object.create(null);
     return /* @__PURE__ */ jsx_dev_runtime363.jsxDEV(PermissionDialog, {
       title: currentQuestion.question,
       onCancel: handleCancel,
@@ -723806,6 +724385,7 @@ var init_AskUserQuestionPermissionRequest = __esm(() => {
   init_planModeV2();
   init_plans();
   init_PermissionDialog();
+  init_prototypeSafeRecord();
   init_QuestionView();
   init_SubmitQuestionsView();
   init_use_multiple_choice_state();
@@ -728472,9 +729052,8 @@ function ExitPlanModePermissionRequest({
       const transcriptHint = `
 
 If you need specific details from before exiting plan mode (like exact code snippets, error messages, or content you generated), read the full transcript at: ${transcriptPath}`;
-      const teamHint = isAgentSwarmsEnabled() ? `
-
-If this plan can be broken down into multiple independent tasks, consider using the ${TEAM_CREATE_TOOL_NAME} tool to create a team and parallelize the work.` : "";
+      const implementationCapabilities = getApprovedPlanCapabilities(toolUseConfirm.toolUseContext);
+      const implementationInstruction = getApprovedPlanImplementationInstruction(implementationCapabilities);
       const feedbackSuffix = acceptFeedback ? `
 
 User feedback on this plan: ${acceptFeedback}` : "";
@@ -728485,7 +729064,9 @@ User feedback on this plan: ${acceptFeedback}` : "";
             ...createUserMessage({
               content: `Implement the following plan:
 
-${currentPlan}${verificationInstruction}${transcriptHint}${teamHint}${feedbackSuffix}`
+${currentPlan}
+
+${implementationInstruction}${verificationInstruction}${transcriptHint}${feedbackSuffix}`
             }),
             planContent: currentPlan
           },
@@ -728939,6 +729520,7 @@ var import_react211, jsx_dev_runtime374;
 var init_ExitPlanModePermissionRequest = __esm(() => {
   init_figures();
   init_notifications();
+  init_planImplementationContract();
   init_analytics();
   init_AppState();
   init_state();
@@ -728946,7 +729528,6 @@ var init_ExitPlanModePermissionRequest = __esm(() => {
   init_ultraplan();
   init_ink2();
   init_constants2();
-  init_agentSwarmsEnabled();
   init_context();
   init_editor();
   init_file();
@@ -734615,7 +735196,7 @@ var init_useVoiceEnabled = __esm(() => {
 function getSemverPart(version3) {
   return `${import_semver13.major(version3, { loose: true })}.${import_semver13.minor(version3, { loose: true })}.${import_semver13.patch(version3, { loose: true })}`;
 }
-function useUpdateNotification(updatedVersion, initialVersion = "1.65.9") {
+function useUpdateNotification(updatedVersion, initialVersion = "1.65.11") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react222.useState(() => getSemverPart(initialVersion));
   if (!updatedVersion) {
     return null;
@@ -734664,7 +735245,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "1.65.9";
+    const currentVersion = "1.65.11";
     const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel);
     const isDisabled = isAutoUpdaterDisabled();
@@ -734893,12 +735474,12 @@ function NativeAutoUpdater({
     logEvent("tengu_native_auto_updater_start", {});
     try {
       const maxVersion = await getMaxVersion();
-      if (maxVersion && gt("1.65.9", maxVersion)) {
+      if (maxVersion && gt("1.65.11", maxVersion)) {
         const msg = await getMaxVersionMessage();
         setMaxVersionIssue(msg ?? "affects your version");
       }
       const result = await installLatest(channel);
-      const currentVersion = "1.65.9";
+      const currentVersion = "1.65.11";
       const latencyMs = Date.now() - startTime;
       if (result.lockFailed) {
         logEvent("tengu_native_auto_updater_lock_contention", {
@@ -735035,17 +735616,17 @@ function PackageManagerAutoUpdater(t0) {
       const maxVersion = await getMaxVersion();
       if (maxVersion && latest && gt(latest, maxVersion)) {
         logForDebugging(`PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`);
-        if (gte("1.65.9", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.65.9"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("1.65.11", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.65.11"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("1.65.9", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("1.65.11", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.65.9"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.65.11"} -> ${latest}`);
       }
     };
     $2[0] = t1;
@@ -735079,7 +735660,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "1.65.9"
+        "1.65.11"
       ]
     }, undefined, true, undefined, this);
     $2[3] = verbose;
@@ -745799,7 +746380,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "1.65.9",
+    version: "1.65.11",
     output_style: {
       name: outputStyleName
     },
@@ -745877,7 +746458,7 @@ function StatusLineInner({
   const taskValues = Object.values(tasks2);
   const taskRunningCount = countActiveBackgroundTasks(taskValues);
   const defaultStatusLineText = buildDefaultStatusBar({
-    version: "1.65.9",
+    version: "1.65.11",
     providerLabel: providerRuntime.providerLabel,
     authMode: providerRuntime.authLabel,
     model: renderModelName(mainLoopModel) || providerRuntime.model || "",
@@ -746900,7 +747481,7 @@ var init_ghPrStatus = __esm(() => {
 
 // src/hooks/usePrStatus.ts
 function usePrStatus(isLoading, enabled = true) {
-  const [prStatus, setPrStatus] = import_react248.useState(INITIAL_STATE3);
+  const [prStatus, setPrStatus] = import_react248.useState(INITIAL_STATE2);
   const timeoutRef = import_react248.useRef(null);
   const disabledRef = import_react248.useRef(false);
   const lastFetchRef = import_react248.useRef(0);
@@ -746964,13 +747545,13 @@ function usePrStatus(isLoading, enabled = true) {
   }, [isLoading, enabled]);
   return prStatus;
 }
-var import_react248, POLL_INTERVAL_MS3 = 60000, SLOW_GH_THRESHOLD_MS = 4000, IDLE_STOP_MS, INITIAL_STATE3;
+var import_react248, POLL_INTERVAL_MS3 = 60000, SLOW_GH_THRESHOLD_MS = 4000, IDLE_STOP_MS, INITIAL_STATE2;
 var init_usePrStatus = __esm(() => {
   init_state();
   init_ghPrStatus();
   import_react248 = __toESM(require_react(), 1);
   IDLE_STOP_MS = 60 * 60000;
-  INITIAL_STATE3 = {
+  INITIAL_STATE2 = {
     number: null,
     url: null,
     reviewState: null,
@@ -758057,7 +758638,7 @@ async function submitTranscriptShare(messages, trigger2, appearanceId) {
     } catch {}
     const data = {
       trigger: trigger2,
-      version: "1.65.9",
+      version: "1.65.11",
       platform: process.platform,
       transcript,
       subagentTranscripts: Object.keys(subagentTranscripts).length > 0 ? subagentTranscripts : undefined,
@@ -770422,7 +771003,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "1.65.9"
+              "1.65.11"
             ]
           }, undefined, true, undefined, this)
         ]
@@ -771682,7 +772263,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "1.65.9"
+    lastOnboardingVersion: "1.65.11"
   }));
 }
 function showDialog(root2, renderer) {
@@ -776726,7 +777307,7 @@ function appendToLog(path24, message) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "1.65.9"
+    version: "1.65.11"
   };
   getLogWriter(path24).write(messageWithTimestamp);
 }
@@ -780890,8 +781471,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("1.65.9", cfg.min_version)) {
-    return `Your version of UR (${"1.65.9"}) is too old for Remote Control.
+  if (cfg.min_version && lt("1.65.11", cfg.min_version)) {
+    return `Your version of UR (${"1.65.11"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`ur update\` to update.`;
   }
   return null;
@@ -781365,7 +781946,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "1.65.9",
+    runnerVersion: "1.65.11",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -790838,7 +791419,7 @@ function getAgUiCapabilities() {
       name: "UR-Nexus",
       type: "ur-nexus",
       description: "Provider-flexible, local-first autonomous engineering workflow agent.",
-      version: "1.65.9",
+      version: "1.65.11",
       provider: "UR",
       documentationUrl: "https://github.com/Maitham16/UR/blob/master/docs/AG_UI.md"
     },
@@ -791978,7 +792559,7 @@ function createMCPServer(cwd4, debug2, verbose) {
   };
   const server2 = new Server({
     name: "ur-nexus",
-    version: "1.65.9"
+    version: "1.65.11"
   }, {
     capabilities: {
       tools: {}
@@ -793136,7 +793717,7 @@ function thrownResponse(error40) {
 }
 async function createUrMcp2026Runtime(options4) {
   const server2 = createMCPServer(options4.cwd, options4.debug === true, options4.verbose === true);
-  const client2 = new Client({ name: "ur-mcp-2026-adapter", version: "1.65.9" }, { capabilities: {} });
+  const client2 = new Client({ name: "ur-mcp-2026-adapter", version: "1.65.11" }, { capabilities: {} });
   const [clientTransport, serverTransport] = createLinkedTransportPair();
   try {
     await server2.connect(serverTransport);
@@ -793147,7 +793728,7 @@ async function createUrMcp2026Runtime(options4) {
   }
   const runtime2 = new Mcp2026Runtime({
     cwd: options4.cwd,
-    version: "1.65.9",
+    version: "1.65.11",
     backend: {
       listTools: async () => {
         const listed = await client2.listTools();
@@ -795280,7 +795861,7 @@ async function update() {
   logEvent("tengu_update_check", {});
   const diagnostic2 = await getDoctorDiagnostic();
   const result = await checkUpgradeStatus({
-    currentVersion: "1.65.9",
+    currentVersion: "1.65.11",
     packageName: UR_AGENT_PACKAGE_NAME,
     installationType: diagnostic2.installationType,
     latestVersion: () => getLatestNpmPackageVersion(UR_AGENT_PACKAGE_NAME)
@@ -796596,7 +797177,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "1.65.9",
+      version: "1.65.11",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -797382,7 +797963,7 @@ Usage: ur --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("1.65.9 (UR-Nexus)", "-v, --version", "Output the version number");
+  }).version("1.65.11 (UR-Nexus)", "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -798441,7 +799022,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"1.65.9"} (UR-Nexus)`);
+    console.log(`${"1.65.11"} (UR-Nexus)`);
     return;
   }
   if (args[0] === "a2a" && args[1] === "serve" && !args.includes("--help") && !args.includes("-h")) {