ur-agent 1.65.10 → 1.65.12

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
@@ -57481,6 +57328,7 @@ __export(exports_ollama, {
   mergeToolCalls: () => mergeToolCalls,
   isOllamaCloudModel: () => isOllamaCloudModel2,
   getOllamaRequestTimeoutMs: () => getOllamaRequestTimeoutMs,
+  getOllamaModelDefaultTimeoutMs: () => getOllamaModelDefaultTimeoutMs,
   getEffectiveOllamaBaseUrl: () => getEffectiveOllamaBaseUrl,
   createOllamaURHQClient: () => createOllamaURHQClient,
   consumePendingProviderNotice: () => consumePendingProviderNotice,
@@ -57633,14 +57481,21 @@ function getOllamaRequestTimeoutMs(options, env4 = process.env, model) {
   if (isTruthyEnv(env4.UR_CODE_REMOTE)) {
     return REMOTE_OLLAMA_REQUEST_TIMEOUT_MS;
   }
+  return getOllamaModelDefaultTimeoutMs(model);
+}
+function isOllamaCloudModel2(model) {
+  return model?.trim().toLowerCase().endsWith(":cloud") ?? false;
+}
+function getOllamaModelDefaultTimeoutMs(model) {
+  const normalized = model?.trim().toLowerCase() ?? "";
+  if (/^kimi-k2\.7(?:[-.:]|$)/.test(normalized) && isOllamaCloudModel2(model)) {
+    return KIMI_CLOUD_REQUEST_TIMEOUT_MS;
+  }
   if (isOllamaCloudModel2(model)) {
     return CLOUD_OLLAMA_REQUEST_TIMEOUT_MS;
   }
   return DEFAULT_OLLAMA_REQUEST_TIMEOUT_MS;
 }
-function isOllamaCloudModel2(model) {
-  return model?.trim().toLowerCase().endsWith(":cloud") ?? false;
-}
 function isTruthyEnv(value) {
   if (!value) {
     return false;
@@ -58115,11 +57970,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 +58110,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({
@@ -58577,7 +58424,7 @@ function parseToolInput(input) {
   }
   return normalized;
 }
-var DEFAULT_OLLAMA_REQUEST_TIMEOUT_MS = 300000, REMOTE_OLLAMA_REQUEST_TIMEOUT_MS = 120000, CLOUD_OLLAMA_REQUEST_TIMEOUT_MS = 120000, OLLAMA_GATEWAY_TIMEOUT_MESSAGE = "Ollama gateway timed out while waiting for the model to respond. Check the selected Ollama endpoint or increase API_TIMEOUT_MS if the model needs more time.", ollamaModelCapabilitiesCache, warnedToolsUnsupportedModels, TEXT_TOOL_CALL_HINT, pendingProviderNotice = null, LEVELED_THINK_MODEL_RE;
+var DEFAULT_OLLAMA_REQUEST_TIMEOUT_MS = 300000, REMOTE_OLLAMA_REQUEST_TIMEOUT_MS = 120000, CLOUD_OLLAMA_REQUEST_TIMEOUT_MS = 120000, KIMI_CLOUD_REQUEST_TIMEOUT_MS = 300000, OLLAMA_GATEWAY_TIMEOUT_MESSAGE = "Ollama gateway timed out while waiting for the model to respond. Check the selected Ollama endpoint or increase API_TIMEOUT_MS if the model needs more time.", ollamaModelCapabilitiesCache, warnedToolsUnsupportedModels, TEXT_TOOL_CALL_HINT, pendingProviderNotice = null, LEVELED_THINK_MODEL_RE;
 var init_ollama = __esm(() => {
   init_urhq_sdk();
   init_ollamaModels();
@@ -75597,7 +75444,7 @@ var init_auth = __esm(() => {
 
 // src/utils/userAgent.ts
 function getURCodeUserAgent() {
-  return `ur/${"1.65.10"}`;
+  return `ur/${"1.65.12"}`;
 }
 
 // src/utils/workloadContext.ts
@@ -75619,7 +75466,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.10"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
+  return `ur-cli/${"1.65.12"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
 }
 function getMCPUserAgent() {
   const parts = [];
@@ -75633,7 +75480,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.10"}${suffix}`;
+  return `ur/${"1.65.12"}${suffix}`;
 }
 function getWebFetchUserAgent() {
   return `UR-User (${getURCodeUserAgent()})`;
@@ -75771,7 +75618,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "1.65.10",
+      appVersion: "1.65.12",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -83971,7 +83818,7 @@ var init_metadata = __esm(() => {
   COMPOUND_OPERATOR_REGEX = /\s*(?:&&|\|\||[;|])\s*/;
   WHITESPACE_REGEX = /\s+/;
   getVersionBase = memoize_default(() => {
-    const match = "1.65.10".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
+    const match = "1.65.12".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
     return match ? match[0] : undefined;
   });
   buildEnvContext = memoize_default(async () => {
@@ -84011,7 +83858,7 @@ var init_metadata = __esm(() => {
       isGithubAction: isEnvTruthy(process.env.GITHUB_ACTIONS),
       isURCodeAction: isEnvTruthy(process.env.UR_CODE_ACTION),
       isURAiAuth: isURAISubscriber(),
-      version: "1.65.10",
+      version: "1.65.12",
       versionBase: getVersionBase(),
       buildTime: "",
       deploymentEnvironment: env2.detectDeploymentEnvironment(),
@@ -84681,7 +84528,7 @@ function initialize1PEventLogging() {
   const platform2 = getPlatform();
   const attributes = {
     [import_semantic_conventions4.ATTR_SERVICE_NAME]: "ur",
-    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.65.10"
+    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.65.12"
   };
   if (platform2 === "wsl") {
     const wslVersion = getWslVersion();
@@ -84709,7 +84556,7 @@ function initialize1PEventLogging() {
       })
     ]
   });
-  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.65.10");
+  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.65.12");
 }
 async function reinitialize1PEventLoggingIfConfigChanged() {
   if (!is1PEventLoggingEnabled() || !firstPartyEventLoggerProvider) {
@@ -94597,7 +94444,7 @@ function formatAgentTrendReport(report = buildAgentTrendReport()) {
 function formatA2AAgentCard(options = {}, pretty = true) {
   return JSON.stringify(buildA2AAgentCard(options), null, pretty ? 2 : 0);
 }
-var urVersion = "1.65.10", researchSnapshotDate = "2026-07-15", coverage, priorityRoadmap;
+var urVersion = "1.65.12", researchSnapshotDate = "2026-07-15", coverage, priorityRoadmap;
 var init_trends = __esm(() => {
   init_a2aCardSignature();
   coverage = [
@@ -97400,7 +97247,7 @@ function getAttributionHeader(fingerprint) {
   if (!isAttributionHeaderEnabled()) {
     return "";
   }
-  const version2 = `${"1.65.10"}.${fingerprint}`;
+  const version2 = `${"1.65.12"}.${fingerprint}`;
   const entrypoint = process.env.UR_CODE_ENTRYPOINT ?? "unknown";
   const cch = "";
   const workload = getWorkload();
@@ -97921,6 +97768,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.`;
@@ -155269,7 +155120,7 @@ var init_projectSafety = __esm(() => {
 function getInstruments() {
   if (instruments)
     return instruments;
-  const meter = import_api10.metrics.getMeter("ur-agent.gen_ai", "1.65.10");
+  const meter = import_api10.metrics.getMeter("ur-agent.gen_ai", "1.65.12");
   instruments = {
     operationDuration: meter.createHistogram("gen_ai.client.operation.duration", {
       description: "GenAI operation duration.",
@@ -155367,7 +155218,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.10"
+    "gen_ai.agent.version": "1.65.12"
   };
 }
 function genAiWorkflowAttributes(workflowName) {
@@ -155383,7 +155234,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.10").startSpan(name, { kind: import_api10.SpanKind.INTERNAL, attributes });
+  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.12").startSpan(name, { kind: import_api10.SpanKind.INTERNAL, attributes });
 }
 function endGenAiWorkflowSpan(span, options2 = {}) {
   try {
@@ -155421,7 +155272,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.10").startSpan(operation, { kind: import_api10.SpanKind.INTERNAL, attributes });
+  return import_api10.trace.getTracer("ur-agent.gen_ai", "1.65.12").startSpan(operation, { kind: import_api10.SpanKind.INTERNAL, attributes });
 }
 function endGenAiMemorySpan(span, options2 = {}) {
   try {
@@ -248904,7 +248755,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "1.65.10";
+    attributes["app.version"] = "1.65.12";
   }
   const oauthAccount = getOauthAccountInfo();
   if (oauthAccount) {
@@ -265115,11 +264966,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:
@@ -265130,10 +264981,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.
@@ -295438,7 +295299,7 @@ function getInstallationEnv() {
   return;
 }
 function getURCodeVersion() {
-  return "1.65.10";
+  return "1.65.12";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -302769,7 +302630,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client2 = new Client({
       name: "ur",
       title: "UR",
-      version: "1.65.10",
+      version: "1.65.12",
       description: "UR-Nexus autonomous engineering workflow engine",
       websiteUrl: PRODUCT_URL
     }, {
@@ -303129,7 +302990,7 @@ var init_client5 = __esm(() => {
       const client2 = new Client({
         name: "ur",
         title: "UR",
-        version: "1.65.10",
+        version: "1.65.12",
         description: "UR-Nexus autonomous engineering workflow engine",
         websiteUrl: PRODUCT_URL
       }, {
@@ -315668,7 +315529,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.10"
+    [import_semantic_conventions7.ATTR_SERVICE_VERSION]: "1.65.12"
   }));
   const tracerProvider = exporters.traces.length > 0 ? new BasicTracerProvider({
     resource,
@@ -315701,11 +315562,11 @@ async function createRuntime() {
   setMeterProvider(meterProvider);
   setLoggerProvider(loggerProvider);
   if (meterProvider) {
-    const meter = meterProvider.getMeter("ur-agent", "1.65.10");
+    const meter = meterProvider.getMeter("ur-agent", "1.65.12");
     setMeter(meter, (name, options2) => meter.createCounter(name, options2));
   }
   if (loggerProvider) {
-    setEventLogger(loggerProvider.getLogger("ur-agent.events", "1.65.10"));
+    setEventLogger(loggerProvider.getLogger("ur-agent.events", "1.65.12"));
   }
   if (!cleanupRegistered2) {
     cleanupRegistered2 = true;
@@ -316367,9 +316228,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.10", versionConfig.minVersion)) {
+    if (versionConfig.minVersion && lt("1.65.12", versionConfig.minVersion)) {
       console.error(`
-It looks like your version of UR (${"1.65.10"}) needs an update.
+It looks like your version of UR (${"1.65.12"}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
 
 To update, please run:
@@ -316585,7 +316446,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.10"
+      currentVersion: "1.65.12"
     });
     return "in_progress";
   }
@@ -316594,7 +316455,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.10"
+        currentVersion: "1.65.12"
       });
       console.error(`
 Error: Windows NPM detected in WSL
@@ -317129,7 +316990,7 @@ function detectLinuxGlobPatternWarnings() {
 }
 async function getDoctorDiagnostic() {
   const installationType = await getCurrentInstallationType();
-  const version2 = typeof MACRO !== "undefined" ? "1.65.10" : "unknown";
+  const version2 = typeof MACRO !== "undefined" ? "1.65.12" : "unknown";
   const installationPath = await getInstallationPath();
   const invokedBinary = getInvokedBinary();
   const multipleInstallations = await detectMultipleInstallations();
@@ -318064,8 +317925,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.10", maxVersion)) {
-        logForDebugging(`Native installer: current version ${"1.65.10"} is already at or above maxVersion ${maxVersion}, skipping update`);
+      if (gte("1.65.12", maxVersion)) {
+        logForDebugging(`Native installer: current version ${"1.65.12"} is already at or above maxVersion ${maxVersion}, skipping update`);
         logEvent("tengu_native_update_skipped_max_version", {
           latency_ms: Date.now() - startTime,
           max_version: maxVersion,
@@ -318076,7 +317937,7 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
       version2 = maxVersion;
     }
   }
-  if (!forceReinstall && version2 === "1.65.10" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
+  if (!forceReinstall && version2 === "1.65.12" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
     logForDebugging(`Found ${version2} at ${executablePath}, skipping install`);
     logEvent("tengu_native_update_complete", {
       latency_ms: Date.now() - startTime,
@@ -361148,7 +361009,7 @@ 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 the current file as one exact, contiguous block. If it is not found, re-read the target region and retry with a corrected smaller block; never retry the unchanged call.
+- \`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.`;
 }
@@ -361192,6 +361053,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()
   }));
 });
@@ -363543,30 +363405,48 @@ function findSearchAnchor(fileContent, searchString) {
       occurrencesByLine.set(normalized, { firstIndex: index2, count: 1 });
     }
   }
-  let repeatedMatch = null;
-  for (const searchLine of searchString.split(`
-`)) {
+  const candidates = [];
+  const searchLines = searchString.split(`
+`);
+  for (let searchIndex = 0;searchIndex < searchLines.length; searchIndex++) {
+    const searchLine = searchLines[searchIndex];
     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 ??= {
+    candidates.push({
       fileLine: occurrence.firstIndex + 1,
-      unique: false
-    };
+      unique: occurrence.count === 1,
+      searchLine: normalized,
+      searchLineNumber: searchIndex + 1,
+      occurrenceCount: occurrence.count,
+      distinctiveCharacterCount: normalized.replace(/[^A-Za-z0-9_$]/g, "").length
+    });
   }
-  return repeatedMatch;
+  candidates.sort((left, right) => {
+    if (left.unique !== right.unique)
+      return left.unique ? -1 : 1;
+    if (left.occurrenceCount !== right.occurrenceCount) {
+      return left.occurrenceCount - right.occurrenceCount;
+    }
+    if (left.distinctiveCharacterCount !== right.distinctiveCharacterCount) {
+      return right.distinctiveCharacterCount - left.distinctiveCharacterCount;
+    }
+    if (left.searchLine.length !== right.searchLine.length) {
+      return right.searchLine.length - left.searchLine.length;
+    }
+    return left.searchLineNumber - right.searchLineNumber;
+  });
+  return candidates[0] ?? null;
 }
 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 anchorPreview = anchor ? JSON.stringify(anchor.searchLine.length > 160 ? `${anchor.searchLine.slice(0, 160)}\u2026` : anchor.searchLine) : null;
+  const location = anchor ? `The verified anchor ${anchorPreview} from old_string line ${anchor.searchLineNumber} ${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;
@@ -363592,6 +363472,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;
@@ -363967,11 +363856,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,
@@ -364447,6 +364345,9 @@ 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",
@@ -364510,6 +364411,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);
@@ -364627,7 +364549,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 {
@@ -373287,6 +373216,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;
@@ -373306,81 +373250,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);
@@ -373445,18 +373416,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();
@@ -373466,59 +373434,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({
@@ -373539,6 +373530,7 @@ var init_AskUserQuestionTool = __esm(() => {
     get inputSchema() {
       return inputSchema32();
     },
+    inputJSONSchema: modelInputJSONSchema,
     get outputSchema() {
       return outputSchema27();
     },
@@ -373561,14 +373553,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);
@@ -373581,6 +373569,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
       };
@@ -373628,9 +373655,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,
@@ -375332,10 +375362,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);
@@ -377993,6 +378023,117 @@ var init_TaskGetTool = __esm(() => {
   });
 });
 
+// src/tools/TaskUpdateTool/completionEvidence.ts
+function messageBlocks(message) {
+  const content = message.message?.content;
+  return Array.isArray(content) ? content : [];
+}
+function successfulCalls(messages) {
+  if (!Array.isArray(messages))
+    return [];
+  const toolUses = new Map;
+  const calls = [];
+  let sequence = 0;
+  for (const [messageIndex, candidate] of messages.entries()) {
+    if (typeof candidate !== "object" || candidate === null)
+      continue;
+    const message = candidate;
+    for (const block2 of messageBlocks(message)) {
+      sequence++;
+      if (typeof block2 !== "object" || block2 === null)
+        continue;
+      const value = block2;
+      if (value.type === "tool_use" && typeof value.id === "string" && typeof value.name === "string") {
+        toolUses.set(value.id, {
+          name: value.name,
+          input: typeof value.input === "object" && value.input !== null ? value.input : {},
+          sequence,
+          assistantMessage: messageIndex
+        });
+        continue;
+      }
+      if (value.type !== "tool_result" || typeof value.tool_use_id !== "string") {
+        continue;
+      }
+      const toolUse = toolUses.get(value.tool_use_id);
+      if (!toolUse)
+        continue;
+      calls.push({
+        ...toolUse,
+        succeeded: value.is_error !== true
+      });
+    }
+  }
+  return calls.sort((left, right) => left.sequence - right.sequence);
+}
+function sameTaskId(value, taskId) {
+  return (typeof value === "string" || typeof value === "number") && String(value) === taskId;
+}
+function mutationTarget(call6) {
+  for (const key of ["file_path", "notebook_path", "path"]) {
+    const value = call6.input[key];
+    if (typeof value === "string" && value.trim() !== "")
+      return value;
+  }
+  return;
+}
+function evaluateCompletionEvidence(input) {
+  const calls = successfulCalls(input.messages);
+  let startedAt = -1;
+  for (const call6 of calls) {
+    if (call6.succeeded && call6.name === "TaskUpdate" && sameTaskId(call6.input.taskId, input.taskId) && call6.input.status === "in_progress") {
+      startedAt = call6.sequence;
+    }
+  }
+  if (startedAt < 0)
+    return { defer: false };
+  let latestMutation;
+  let hasEvidenceAfterMutation = false;
+  for (const call6 of calls) {
+    if (!call6.succeeded || call6.sequence <= startedAt)
+      continue;
+    if (FILE_MUTATION_TOOLS.has(call6.name)) {
+      latestMutation = call6;
+      hasEvidenceAfterMutation = false;
+      continue;
+    }
+    if (latestMutation && call6.assistantMessage > latestMutation.assistantMessage && COMPLETION_EVIDENCE_TOOLS.has(call6.name)) {
+      hasEvidenceAfterMutation = true;
+    }
+  }
+  if (!latestMutation || hasEvidenceAfterMutation) {
+    return { defer: false };
+  }
+  return {
+    defer: true,
+    mutationTool: latestMutation.name,
+    target: mutationTarget(latestMutation)
+  };
+}
+var FILE_MUTATION_TOOLS, COMPLETION_EVIDENCE_TOOLS;
+var init_completionEvidence = __esm(() => {
+  FILE_MUTATION_TOOLS = new Set([
+    "Write",
+    "Edit",
+    "MultiEdit",
+    "NotebookEdit"
+  ]);
+  COMPLETION_EVIDENCE_TOOLS = new Set([
+    "Read",
+    "Grep",
+    "Glob",
+    "LSP",
+    "Bash",
+    "PowerShell",
+    "TestRunner",
+    "Browser",
+    "Computer",
+    "TaskOutput",
+    "Agent",
+    "Task"
+  ]);
+});
+
 // src/tools/TaskUpdateTool/prompt.ts
 var DESCRIPTION16 = "Update a task in the task list", PROMPT7 = `Use this tool to update a task in the task list.
 
@@ -378004,6 +378145,12 @@ var DESCRIPTION16 = "Update a task in the task list", PROMPT7 = `Use this tool t
 - After completion, call TaskList to find the next unblocked task
 
 - ONLY mark a task as completed when you have FULLY accomplished it
+- After changing a file, run a relevant observable check in a later tool turn
+  before completing the final actionable task. A Write/Edit result proves only
+  that bytes changed, not that the result works.
+- If that final completion has no successful post-change check, TaskUpdate
+  keeps the same task in_progress and names the next verification action. Run
+  it and retry completion; do not create a duplicate task.
 - If you encounter errors, blockers, or cannot finish, keep the task as in_progress
 - When blocked, record the blocking work as a dependency or notify the owner
 - Never mark a task as completed if:
@@ -378068,6 +378215,7 @@ var init_TaskUpdateTool = __esm(() => {
   init_teammateMailbox();
   init_constants2();
   init_taskIdInput();
+  init_completionEvidence();
   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.");
@@ -378092,7 +378240,10 @@ var init_TaskUpdateTool = __esm(() => {
       from: exports_external.string(),
       to: exports_external.string()
     }).optional(),
-    verificationNudgeNeeded: exports_external.boolean().optional()
+    verificationNudgeNeeded: exports_external.boolean().optional(),
+    completionDeferred: exports_external.boolean().optional(),
+    completionMutationTool: exports_external.string().optional(),
+    completionVerificationTarget: exports_external.string().optional()
   }));
   TaskUpdateTool = buildTool({
     name: TASK_UPDATE_TOOL_NAME,
@@ -378188,6 +378339,9 @@ var init_TaskUpdateTool = __esm(() => {
         };
       }
       const updatedFields = [];
+      let completionDeferred = false;
+      let completionMutationTool;
+      let completionVerificationTarget;
       const updates = {};
       if (subject !== undefined && subject !== existingTask.subject) {
         updates.subject = subject;
@@ -378258,27 +378412,43 @@ var init_TaskUpdateTool = __esm(() => {
                 }
               };
             }
-            const blockingErrors = [];
-            const generator = executeTaskCompletedHooks(taskId, existingTask.subject, existingTask.description, getAgentName(), getTeamName(), undefined, context5?.abortController?.signal, undefined, context5);
-            for await (const result of generator) {
-              if (result.blockingError) {
-                blockingErrors.push(getTaskCompletedHookMessage(result.blockingError));
+            const otherActionableTasks = [...tasksById.values()].filter((task) => task.id !== taskId && !task.metadata?._internal && (task.status === "pending" || task.status === "in_progress"));
+            if (existingTask.status === "in_progress" && otherActionableTasks.length === 0) {
+              const evidence = evaluateCompletionEvidence({
+                messages: context5.messages,
+                taskId
+              });
+              if (evidence.defer) {
+                completionDeferred = true;
+                completionMutationTool = evidence.mutationTool;
+                completionVerificationTarget = evidence.target;
+              }
+            }
+            if (!completionDeferred) {
+              const blockingErrors = [];
+              const generator = executeTaskCompletedHooks(taskId, existingTask.subject, existingTask.description, getAgentName(), getTeamName(), undefined, context5?.abortController?.signal, undefined, context5);
+              for await (const result of generator) {
+                if (result.blockingError) {
+                  blockingErrors.push(getTaskCompletedHookMessage(result.blockingError));
+                }
               }
-            }
-            if (blockingErrors.length > 0) {
-              return {
-                data: {
-                  success: false,
-                  taskId,
-                  updatedFields: [],
-                  error: blockingErrors.join(`
+              if (blockingErrors.length > 0) {
+                return {
+                  data: {
+                    success: false,
+                    taskId,
+                    updatedFields: [],
+                    error: blockingErrors.join(`
 `)
-                }
-              };
+                  }
+                };
+              }
             }
           }
-          updates.status = status;
-          updatedFields.push("status");
+          if (!completionDeferred) {
+            updates.status = status;
+            updatedFields.push("status");
+          }
         }
       }
       const newBlocks = (normalizedAddBlocks ?? []).filter((id) => !existingTask.blocks.includes(id));
@@ -378325,7 +378495,10 @@ var init_TaskUpdateTool = __esm(() => {
           taskId,
           updatedFields,
           statusChange: updates.status !== undefined ? { from: existingTask.status, to: updates.status } : undefined,
-          verificationNudgeNeeded
+          verificationNudgeNeeded,
+          completionDeferred: completionDeferred || undefined,
+          completionMutationTool,
+          completionVerificationTarget
         }
       };
     },
@@ -378336,7 +378509,10 @@ var init_TaskUpdateTool = __esm(() => {
         updatedFields,
         error: error40,
         statusChange,
-        verificationNudgeNeeded
+        verificationNudgeNeeded,
+        completionDeferred,
+        completionMutationTool,
+        completionVerificationTarget
       } = content;
       if (!success2) {
         return {
@@ -378346,6 +378522,14 @@ var init_TaskUpdateTool = __esm(() => {
           is_error: true
         };
       }
+      if (completionDeferred) {
+        const target = completionVerificationTarget ? ` to ${completionVerificationTarget}` : "";
+        return {
+          tool_use_id: toolUseID,
+          type: "tool_result",
+          content: `Task #${taskId} remains in_progress. ` + `${completionMutationTool ?? "A file tool"} made the latest change` + `${target}, but no successful observable check ran afterward. ` + `Run the smallest relevant verification now, fix any failure, then ` + `retry TaskUpdate with status completed. For a browser UI, load it ` + `and inspect runtime/console behavior. Do not create a duplicate ` + `task; this task is still actionable.`
+        };
+      }
       let resultContent = `Updated task #${taskId} ${updatedFields.join(", ")}`;
       if (statusChange?.to === "completed" && getAgentId() && isAgentSwarmsEnabled()) {
         resultContent += `
@@ -387801,7 +387985,7 @@ function isAnyTracingEnabled() {
   return isTelemetryEnabled() || isEnhancedTelemetryEnabled() || isBetaTracingEnabled();
 }
 function getTracer() {
-  return import_api39.trace.getTracer("ur-agent.gen_ai", "1.65.10");
+  return import_api39.trace.getTracer("ur-agent.gen_ai", "1.65.12");
 }
 function createSpanAttributes(spanType, customAttributes = {}) {
   const baseAttributes = getTelemetryAttributes();
@@ -388420,9 +388604,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+)/);
@@ -388435,10 +388739,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);
@@ -388451,6 +388753,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;
 }
@@ -388460,9 +388775,65 @@ var init_toolErrors = __esm(() => {
 });
 
 // src/services/tools/taskListGate.ts
+import { dirname as dirname45 } from "path";
+function isShellOperator(token, operator) {
+  return typeof token === "object" && token !== null && "op" in token && token.op === operator;
+}
+function isPlanDirectoryBootstrapForGate(input) {
+  if (typeof input.toolInput !== "object" || input.toolInput === null) {
+    return false;
+  }
+  const candidate = input.toolInput;
+  if (typeof candidate.command !== "string" || 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)
+    return false;
+  const tokens = parsed.tokens;
+  let expectedPlanDirectory;
+  try {
+    expectedPlanDirectory = dirname45(expandPath(input.expectedPlanFile));
+  } catch {
+    return false;
+  }
+  const isPlanDirectory = (token) => {
+    if (typeof token !== "string" || token.trim() === "")
+      return false;
+    try {
+      return expandPath(token) === expectedPlanDirectory;
+    } catch {
+      return false;
+    }
+  };
+  const isMkdir = tokens.length === 3 && tokens[0] === "mkdir" && tokens[1] === "-p" && isPlanDirectory(tokens[2]);
+  if (isMkdir)
+    return true;
+  const hasSilentStderr = tokens[3] === "2" && isShellOperator(tokens[4], ">") && tokens[5] === "/dev/null";
+  const guardOperatorIndex = hasSilentStderr ? 6 : 3;
+  const mkdirIndex = guardOperatorIndex + 1;
+  const hasGuardedMkdir = tokens[0] === "ls" && tokens[1] === "-la" && isPlanDirectory(tokens[2]) && isShellOperator(tokens[guardOperatorIndex], "||") && tokens[mkdirIndex] === "mkdir" && tokens[mkdirIndex + 1] === "-p" && isPlanDirectory(tokens[mkdirIndex + 2]);
+  if (!hasGuardedMkdir)
+    return false;
+  const afterMkdir = mkdirIndex + 3;
+  if (tokens.length === afterMkdir)
+    return true;
+  return tokens.length === afterMkdir + 4 && isShellOperator(tokens[afterMkdir], "&&") && tokens[afterMkdir + 1] === "ls" && tokens[afterMkdir + 2] === "-la" && isPlanDirectory(tokens[afterMkdir + 3]);
+}
 function isPlanArtifactMutationForGate(input) {
   if (!input.isPlanMode)
     return false;
+  if (input.toolName === "Bash") {
+    return isPlanDirectoryBootstrapForGate({
+      toolInput: input.toolInput,
+      expectedPlanFile: input.expectedPlanFile
+    });
+  }
   if (!PLAN_ARTIFACT_MUTATING_TOOLS.has(input.toolName))
     return false;
   if (typeof input.toolInput !== "object" || input.toolInput === null || !("file_path" in input.toolInput)) {
@@ -388477,6 +388848,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)
@@ -388521,23 +388922,28 @@ function checkTaskListGate(input) {
   }
   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 ` + `${taskTool2} before delegating or changing state, then retry this call. ` + `${TASK_DECOMPOSITION_RECOVERY} ` + `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 ${taskTool} first, then retry this call. ` + `${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.`
+    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, TASK_DECOMPOSITION_RECOVERY, 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
@@ -388560,7 +388966,8 @@ var init_taskListGate = __esm(() => {
     "TaskUpdate",
     "TaskList",
     "TaskGet",
-    "TodoWrite"
+    "TodoWrite",
+    "ExitPlanMode"
   ]);
   ALWAYS_REQUIRE_PLAN_TOOLS = new Set([
     "Agent",
@@ -388572,6 +388979,11 @@ var init_taskListGate = __esm(() => {
     "Edit",
     "MultiEdit"
   ]);
+  LOOPBACK_PREVIEW_HOSTS = new Set([
+    "localhost",
+    "127.0.0.1",
+    "[::1]"
+  ]);
 });
 
 // src/services/tools/repeatedFailureGuard.ts
@@ -388965,7 +389377,7 @@ var init_rootcause = __esm(() => {
 
 // src/stability/ledger.ts
 import { appendFileSync as appendFileSync4, existsSync as existsSync29, mkdirSync as mkdirSync19, readFileSync as readFileSync31 } from "fs";
-import { dirname as dirname45, join as join109 } from "path";
+import { dirname as dirname46, join as join109 } from "path";
 function ledgerPath(cwd2) {
   return join109(cwd2, ".ur", "actions.jsonl");
 }
@@ -388993,7 +389405,7 @@ function filesFromArgs(args) {
 function recordAction(cwd2, record3) {
   try {
     const file2 = ledgerPath(cwd2);
-    mkdirSync19(dirname45(file2), { recursive: true });
+    mkdirSync19(dirname46(file2), { recursive: true });
     appendFileSync4(file2, JSON.stringify(record3) + `
 `);
   } catch {}
@@ -389623,16 +390035,24 @@ 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;
   }
 }
 function isCurrentPlanArtifactMutation(toolName, input, toolUseContext) {
-  if (toolName !== FILE_WRITE_TOOL_NAME && toolName !== FILE_EDIT_TOOL_NAME && toolName !== "MultiEdit") {
+  if (toolName !== FILE_WRITE_TOOL_NAME && toolName !== FILE_EDIT_TOOL_NAME && toolName !== "MultiEdit" && toolName !== BASH_TOOL_NAME) {
     return false;
   }
   try {
@@ -390144,6 +390564,11 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
     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 [
@@ -390161,12 +390586,14 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
       }
     ];
   }
+  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,
+    isMutating: isTaskListGatedMutation,
     isPlanArtifactMutation,
     taskPlanningToolName: getTaskPlanningToolName(toolUseContext)
   });
@@ -390492,7 +390919,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"
@@ -390524,6 +390951,11 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
     finalIsMutating = true;
   }
   const finalIsPlanArtifactMutation = isCurrentPlanArtifactMutation(tool.name, finalParsedInput.data, toolUseContext);
+  const finalIsTaskListGatedMutation = isMutationRequiringTaskList({
+    toolName: tool.name,
+    toolInput: finalParsedInput.data,
+    isMutating: finalIsMutating
+  });
   if (finalIsMutating && isBuiltInReadOnlyPlanningSubagent(toolUseContext)) {
     recordCallFailure(callSig);
     finishPreExecutionRejection();
@@ -390542,14 +390974,16 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input, toolUseContex
     });
     return resultingMessages;
   }
-  const effectiveCallChanged = callSig !== initiallyValidatedCallSig || finalIsMutating !== isMutating || finalIsPlanArtifactMutation !== isPlanArtifactMutation;
-  if (finalIsMutating && !finalIsPlanArtifactMutation) {
+  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,
+      isMutating: finalIsTaskListGatedMutation,
       isPlanArtifactMutation: finalIsPlanArtifactMutation,
       taskPlanningToolName: getTaskPlanningToolName(toolUseContext)
     });
@@ -391354,6 +391788,292 @@ var init_StreamingToolExecutor = __esm(() => {
   init_toolExecution();
 });
 
+// src/utils/explicitChoiceRecovery.ts
+function objectValue4(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function hasOnlyKeys(value, required2, optional3 = []) {
+  const allowed = new Set([...required2, ...optional3]);
+  const keys2 = Object.keys(value);
+  return required2.every((key) => Object.prototype.hasOwnProperty.call(value, key)) && keys2.every((key) => allowed.has(key));
+}
+function hasCanonicalAskShape(value) {
+  const input = objectValue4(value);
+  if (!input || !hasOnlyKeys(input, ["questions"], ["metadata"]) || !Array.isArray(input.questions) || input.questions.length < 1 || input.questions.length > MAX_QUESTIONS2) {
+    return false;
+  }
+  if (input.metadata !== undefined && !objectValue4(input.metadata)) {
+    return false;
+  }
+  return input.questions.every((questionValue) => {
+    const question = objectValue4(questionValue);
+    if (!question || !hasOnlyKeys(question, ["question", "header", "options"], ["multiSelect"]) || typeof question.question !== "string" || typeof question.header !== "string" || !Array.isArray(question.options) || question.options.length < 2 || question.options.length > MAX_OPTIONS2 || question.multiSelect !== undefined && typeof question.multiSelect !== "boolean") {
+      return false;
+    }
+    return question.options.every((optionValue) => {
+      const option = objectValue4(optionValue);
+      return Boolean(option && hasOnlyKeys(option, ["label"], ["description", "preview"]) && typeof option.label === "string" && (option.description === undefined || typeof option.description === "string") && (option.preview === undefined || typeof option.preview === "string"));
+    });
+  });
+}
+function findJsonObjectEnd2(text, start) {
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let index2 = start;index2 < text.length; index2++) {
+    const character = text[index2];
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+      } else if (character === "\\") {
+        escaped = true;
+      } else if (character === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (character === '"') {
+      inString = true;
+    } else if (character === "{") {
+      depth++;
+    } else if (character === "}") {
+      depth--;
+      if (depth === 0)
+        return index2 + 1;
+      if (depth < 0)
+        return null;
+    }
+  }
+  return null;
+}
+function hasExplicitAskToolIntent(prefix) {
+  const nearby = prefix.slice(-1000);
+  if (/\b(?:for example|example|sample|illustration|schema)\b/i.test(nearby.slice(-240))) {
+    return false;
+  }
+  return /\b(?:use|using|call|calling|invoke|invoking|emit|emitting)\b[\s\S]{0,100}\bAskUserQuestion\b/i.test(nearby) || /\bAskUserQuestion\b[\s\S]{0,100}\b(?:tool|call|invoke)\b/i.test(nearby);
+}
+function parseFinalReasoningAskJson(reasoning) {
+  if (reasoning.length === 0 || reasoning.length > MAX_REASONING_CHARS) {
+    return null;
+  }
+  const trimmed = reasoning.trimEnd();
+  if (!trimmed.endsWith("}"))
+    return null;
+  const candidates2 = [];
+  for (let start = trimmed.indexOf("{");start !== -1; start = trimmed.indexOf("{", start + 1)) {
+    const end = findJsonObjectEnd2(trimmed, start);
+    if (end !== trimmed.length)
+      continue;
+    try {
+      const parsed = JSON.parse(trimmed.slice(start));
+      if (hasCanonicalAskShape(parsed)) {
+        candidates2.push({ start, input: parsed });
+      }
+    } catch {}
+  }
+  if (candidates2.length !== 1)
+    return null;
+  const candidate = candidates2[0];
+  const prefix = trimmed.slice(0, candidate.start);
+  if (prefix.includes("```") || !hasExplicitAskToolIntent(prefix))
+    return null;
+  return candidate.input;
+}
+function headerFromQuestion3(question) {
+  const stopWords = new Set([
+    "a",
+    "about",
+    "also",
+    "an",
+    "are",
+    "be",
+    "do",
+    "does",
+    "for",
+    "is",
+    "or",
+    "should",
+    "support",
+    "that",
+    "the",
+    "this",
+    "to",
+    "want",
+    "we",
+    "what",
+    "which",
+    "with",
+    "without",
+    "you"
+  ]);
+  const word = question.replace(/[^A-Za-z0-9]+/g, " ").split(/\s+/).find((part) => part && !stopWords.has(part.toLowerCase()));
+  const header = word ?? "Choice";
+  return (header.slice(0, 1).toLocaleUpperCase() + header.slice(1)).slice(0, 12);
+}
+function parseExplicitChoicePrompt(text) {
+  if (!text || text.length > MAX_MENU_CHARS || /```|[{}]/.test(text)) {
+    return null;
+  }
+  const lines = text.replace(/\r\n?/g, `
+`).split(`
+`).map((line) => line.trim()).filter(Boolean);
+  const questionIndexes = lines.flatMap((line, index2) => /^\*\*[^*\n]+\?\*\*$/.test(line) ? [index2] : []);
+  if (questionIndexes.length !== 1)
+    return null;
+  const questionIndex = questionIndexes[0];
+  const preamble = lines.slice(0, questionIndex);
+  if (preamble.length > 2 || preamble.some((line) => line.length > 500 || line.includes("?") || /^[-*+#>]/.test(line))) {
+    return null;
+  }
+  const questionMatch = lines[questionIndex].match(/^\*\*([^*\n]+\?)\*\*$/);
+  const question = questionMatch?.[1];
+  if (!question || question.length > MAX_QUESTION_CHARS2)
+    return null;
+  const options2 = [];
+  let lineIndex = questionIndex + 1;
+  while (lineIndex < lines.length) {
+    const match = lines[lineIndex].match(/^-\s+\*\*([^*\n]+)\*\*\s+[\u2013\u2014]\s+(.+)$/);
+    if (!match)
+      break;
+    const label = match[1];
+    const description = match[2];
+    const normalizedLabel = label.toLocaleLowerCase();
+    if (label.length > MAX_LABEL_CHARS2 || description.length > MAX_DESCRIPTION_CHARS2 || normalizedLabel === "other" || normalizedLabel === "__other__") {
+      return null;
+    }
+    options2.push({ label, description });
+    lineIndex++;
+  }
+  if (options2.length < 2 || options2.length > MAX_OPTIONS2)
+    return null;
+  if (new Set(options2.map((option) => option.label.toLocaleLowerCase())).size !== options2.length) {
+    return null;
+  }
+  const trailing = lines.slice(lineIndex);
+  if (trailing.length !== 1 || trailing[0].includes("?") || !/^(?:please\s+)?(?:select|choose|pick)\b.{0,120}\b(?:option|choice)\b/i.test(trailing[0])) {
+    return null;
+  }
+  return {
+    input: {
+      questions: [
+        {
+          question,
+          header: headerFromQuestion3(question),
+          options: options2
+        }
+      ]
+    },
+    source: "markdown_menu",
+    remainingText: preamble.join(`
+`)
+  };
+}
+function collectExplicitChoiceCandidates({
+  thinkingBlocks,
+  textBlocks
+}) {
+  const candidates2 = [];
+  const reasoningCandidates = thinkingBlocks.map(parseFinalReasoningAskJson).filter((input) => input !== null);
+  if (reasoningCandidates.length === 1) {
+    candidates2.push({
+      input: reasoningCandidates[0],
+      source: "thinking_json",
+      remainingText: ""
+    });
+  }
+  const menuCandidates = textBlocks.map(parseExplicitChoicePrompt).filter((candidate) => candidate !== null);
+  if (menuCandidates.length === 1) {
+    candidates2.push(menuCandidates[0]);
+  }
+  return candidates2;
+}
+var MAX_REASONING_CHARS, MAX_MENU_CHARS, MAX_QUESTION_CHARS2 = 500, MAX_LABEL_CHARS2 = 80, MAX_DESCRIPTION_CHARS2 = 500, MAX_OPTIONS2 = 8, MAX_QUESTIONS2 = 4;
+var init_explicitChoiceRecovery = __esm(() => {
+  MAX_REASONING_CHARS = 64 * 1024;
+  MAX_MENU_CHARS = 4 * 1024;
+});
+
+// src/services/tools/explicitChoiceRecovery.ts
+import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
+function recoverExplicitChoiceToolUse({
+  assistantMessages,
+  tools,
+  agentId,
+  isNonInteractiveSession,
+  uuid: uuid3
+}) {
+  if (assistantMessages.length === 0 || agentId !== undefined || isNonInteractiveSession || assistantMessages.some((message) => {
+    const content = message.message?.content;
+    return message.isApiErrorMessage || Array.isArray(content) && content.some((block2) => block2.type === "tool_use");
+  })) {
+    return null;
+  }
+  const sourceMessage = assistantMessages.at(-1);
+  if (!sourceMessage?.message || sourceMessage.message.stop_reason !== "end_turn") {
+    return null;
+  }
+  const askTool = findToolByName(tools, ASK_USER_QUESTION_TOOL_NAME);
+  if (!askTool)
+    return null;
+  try {
+    if (!askTool.isEnabled())
+      return null;
+  } catch {
+    return null;
+  }
+  const thinkingBlocks = [];
+  const textBlocks = [];
+  for (const assistantMessage of assistantMessages) {
+    const content = assistantMessage.message?.content;
+    if (!Array.isArray(content))
+      continue;
+    for (const block2 of content) {
+      if (block2.type === "thinking" && typeof block2.thinking === "string") {
+        thinkingBlocks.push(block2.thinking);
+      } else if (block2.type === "text" && typeof block2.text === "string") {
+        textBlocks.push(block2.text);
+      }
+    }
+  }
+  for (const candidate of collectExplicitChoiceCandidates({
+    thinkingBlocks,
+    textBlocks
+  })) {
+    const parsed = askTool.inputSchema.safeParse(candidate.input);
+    if (!parsed.success || !isDeepStrictEqual3(parsed.data, candidate.input)) {
+      continue;
+    }
+    const idSuffix = uuid3().replace(/[^A-Za-z0-9]/g, "");
+    const toolUse = {
+      type: "tool_use",
+      id: `toolu_recovered_${idSuffix}`,
+      name: ASK_USER_QUESTION_TOOL_NAME,
+      input: parsed.data
+    };
+    const assistantMessage = {
+      ...sourceMessage,
+      uuid: uuid3(),
+      message: {
+        ...sourceMessage.message,
+        content: [toolUse],
+        stop_reason: "tool_use"
+      }
+    };
+    return {
+      assistantMessage,
+      source: candidate.source,
+      toolUse
+    };
+  }
+  return null;
+}
+var init_explicitChoiceRecovery2 = __esm(() => {
+  init_Tool();
+  init_prompt9();
+  init_explicitChoiceRecovery();
+});
+
 // src/utils/queryProfiler.ts
 function startQueryProfile() {
   if (!ENABLED)
@@ -392453,7 +393173,7 @@ import {
   unlinkSync as unlinkSync8,
   writeFileSync as writeFileSync20
 } from "fs";
-import { isAbsolute as isAbsolute30, dirname as dirname46, join as join111, relative as relative29, sep as sep25 } from "path";
+import { isAbsolute as isAbsolute30, dirname as dirname47, join as join111, relative as relative29, sep as sep25 } from "path";
 function readJsonl(file2) {
   if (!file2 || !existsSync30(file2))
     return [];
@@ -392481,7 +393201,7 @@ function append2(file2, rec) {
   });
 }
 function writeAtomic(file2, content) {
-  mkdirSync20(dirname46(file2), { recursive: true });
+  mkdirSync20(dirname47(file2), { recursive: true });
   const temporary = `${file2}.${process.pid}.${Date.now()}.tmp`;
   try {
     writeFileSync20(temporary, content, { mode: 384 });
@@ -392527,7 +393247,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");
@@ -392591,7 +393311,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"
   });
 }
@@ -392641,7 +393361,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
   });
 }
@@ -393507,6 +394227,25 @@ async function* queryLoop(params, consumedCommandUuids, ownedRepeatedFailureQuer
       logAntError("Query error", error40);
       return { reason: "model_error", error: error40 };
     }
+    if (!toolUseContext.abortController.signal.aborted) {
+      const recoveredChoice = recoverExplicitChoiceToolUse({
+        assistantMessages,
+        tools: toolUseContext.options.tools,
+        agentId: toolUseContext.agentId,
+        isNonInteractiveSession: Boolean(toolUseContext.options.isNonInteractiveSession),
+        uuid: deps.uuid
+      });
+      if (recoveredChoice) {
+        assistantMessages.push(recoveredChoice.assistantMessage);
+        toolUseBlocks.push(recoveredChoice.toolUse);
+        needsFollowUp = true;
+        logForDebugging(`Recovered explicit AskUserQuestion call from ${recoveredChoice.source}`);
+        yield recoveredChoice.assistantMessage;
+        if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
+          streamingToolExecutor.addTool(recoveredChoice.toolUse, recoveredChoice.assistantMessage);
+        }
+      }
+    }
     if (assistantMessages.length > 0) {
       executePostSamplingHooks([...messagesForQuery, ...assistantMessages], systemPrompt, userContext, systemContext, toolUseContext, querySource);
     }
@@ -394013,6 +394752,7 @@ var init_query = __esm(() => {
   init_dumpPrompts();
   init_verifier();
   init_StreamingToolExecutor();
+  init_explicitChoiceRecovery2();
   init_queryProfiler();
   init_toolOrchestration();
   init_repeatedFailureGuard();
@@ -397438,21 +398178,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, {
@@ -397780,7 +398505,7 @@ var init_toolSearch = __esm(() => {
 // src/services/vcr.ts
 import { createHash as createHash34, randomUUID as randomUUID39 } from "crypto";
 import { mkdir as mkdir24, readFile as readFile33, writeFile as writeFile24 } from "fs/promises";
-import { dirname as dirname47, join as join114 } from "path";
+import { dirname as dirname48, join as join114 } from "path";
 function shouldUseVCR() {
   if (false) {}
   if (process.env.USER_TYPE === "ant" && isEnvTruthy(process.env.FORCE_VCR)) {
@@ -397807,7 +398532,7 @@ async function withFixture(input, fixtureName, f) {
     throw new Error(`Fixture missing: ${filename}. Re-run tests with VCR_RECORD=1, then commit the result.`);
   }
   const result = await f();
-  await mkdir24(dirname47(filename), { recursive: true });
+  await mkdir24(dirname48(filename), { recursive: true });
   await writeFile24(filename, jsonStringify(result, null, 2), {
     encoding: "utf8"
   });
@@ -397846,7 +398571,7 @@ ${jsonStringify(dehydratedInput, null, 2)}`);
   if (env2.isCI && !isEnvTruthy(process.env.VCR_RECORD)) {
     return results;
   }
-  await mkdir24(dirname47(filename), { recursive: true });
+  await mkdir24(dirname48(filename), { recursive: true });
   await writeFile24(filename, jsonStringify({
     input: dehydratedInput,
     output: results.map((message, index2) => mapMessage(message, dehydrateValue, index2))
@@ -399991,7 +400716,7 @@ var init_findRelevantMemories = __esm(() => {
 
 // src/utils/attachments.ts
 import { readdir as readdir18, stat as stat32 } from "fs/promises";
-import { dirname as dirname48, parse as parse13, relative as relative30, resolve as resolve40 } from "path";
+import { dirname as dirname49, parse as parse13, relative as relative30, resolve as resolve40 } from "path";
 import { randomUUID as randomUUID41 } from "crypto";
 function isAttachment(value) {
   return typeof value === "object" && value !== null && "type" in value;
@@ -400384,21 +401109,21 @@ async function getSelectedLinesFromIDE(ideSelection, toolUseContext) {
   ];
 }
 function getDirectoriesToProcess(targetPath, originalCwd) {
-  const targetDir = dirname48(resolve40(targetPath));
+  const targetDir = dirname49(resolve40(targetPath));
   const nestedDirs = [];
   let currentDir = targetDir;
   while (currentDir !== originalCwd && currentDir !== parse13(currentDir).root) {
     if (currentDir.startsWith(originalCwd)) {
       nestedDirs.push(currentDir);
     }
-    currentDir = dirname48(currentDir);
+    currentDir = dirname49(currentDir);
   }
   nestedDirs.reverse();
   const cwdLevelDirs = [];
   currentDir = originalCwd;
   while (currentDir !== parse13(currentDir).root) {
     cwdLevelDirs.push(currentDir);
-    currentDir = dirname48(currentDir);
+    currentDir = dirname49(currentDir);
   }
   cwdLevelDirs.reverse();
   return { nestedDirs, cwdLevelDirs };
@@ -401644,21 +402369,21 @@ var init_attachments2 = __esm(() => {
 });
 
 // src/utils/plugins/loadPluginCommands.ts
-import { basename as basename32, dirname as dirname49, join as join117 } from "path";
+import { basename as basename32, dirname as dirname50, join as join117 } from "path";
 function isSkillFile2(filePath) {
   return /^skill\.md$/i.test(basename32(filePath));
 }
 function getCommandNameFromFile(filePath, baseDir, pluginName) {
   const isSkill = isSkillFile2(filePath);
   if (isSkill) {
-    const skillDirectory = dirname49(filePath);
-    const parentOfSkillDir = dirname49(skillDirectory);
+    const skillDirectory = dirname50(filePath);
+    const parentOfSkillDir = dirname50(skillDirectory);
     const commandBaseName = basename32(skillDirectory);
     const relativePath = parentOfSkillDir.startsWith(baseDir) ? parentOfSkillDir.slice(baseDir.length).replace(/^\//, "") : "";
     const namespace = relativePath ? relativePath.split("/").join(":") : "";
     return namespace ? `${pluginName}:${namespace}:${commandBaseName}` : `${pluginName}:${commandBaseName}`;
   } else {
-    const fileDirectory = dirname49(filePath);
+    const fileDirectory = dirname50(filePath);
     const commandBaseName = basename32(filePath).replace(/\.md$/, "");
     const relativePath = fileDirectory.startsWith(baseDir) ? fileDirectory.slice(baseDir.length).replace(/^\//, "") : "";
     const namespace = relativePath ? relativePath.split("/").join(":") : "";
@@ -401685,7 +402410,7 @@ async function collectMarkdownFiles(dirPath, baseDir, loadedPaths) {
 function transformPluginSkillFiles(files) {
   const filesByDir = new Map;
   for (const file2 of files) {
-    const dir = dirname49(file2.filePath);
+    const dir = dirname50(file2.filePath);
     const dirFiles = filesByDir.get(dir) ?? [];
     dirFiles.push(file2);
     filesByDir.set(dir, dirFiles);
@@ -401774,7 +402499,7 @@ function createPluginCommand(commandName, file2, sourceName, pluginManifest, plu
         return displayName || commandName;
       },
       async getPromptForCommand(args, context5) {
-        let finalContent = config2.isSkillMode ? `Base directory for this skill: ${dirname49(file2.filePath)}
+        let finalContent = config2.isSkillMode ? `Base directory for this skill: ${dirname50(file2.filePath)}
 
 ${content}` : content;
         finalContent = substituteArguments(finalContent, args, true, argumentNames);
@@ -401786,7 +402511,7 @@ ${content}` : content;
           finalContent = substituteUserConfigInContent(finalContent, loadPluginOptions(sourceName), pluginManifest.userConfig);
         }
         if (config2.isSkillMode) {
-          const rawSkillDir = dirname49(file2.filePath);
+          const rawSkillDir = dirname50(file2.filePath);
           const skillDir = process.platform === "win32" ? rawSkillDir.replace(/\\/g, "/") : rawSkillDir;
           finalContent = finalContent.replace(/\$\{UR_SKILL_DIR\}/g, skillDir);
         }
@@ -401846,7 +402571,7 @@ async function loadSkillsFromDirectory(skillsPath, pluginName, sourceName, plugi
       const skillName = `${pluginName}:${basename32(skillsPath)}`;
       const file2 = {
         filePath: directSkillPath,
-        baseDir: dirname49(directSkillPath),
+        baseDir: dirname50(directSkillPath),
         frontmatter,
         content: markdownContent
       };
@@ -401895,7 +402620,7 @@ async function loadSkillsFromDirectory(skillsPath, pluginName, sourceName, plugi
       const skillName = `${pluginName}:${entry.name}`;
       const file2 = {
         filePath: skillFilePath,
-        baseDir: dirname49(skillFilePath),
+        baseDir: dirname50(skillFilePath),
         frontmatter,
         content: markdownContent
       };
@@ -402008,7 +402733,7 @@ var init_loadPluginCommands = __esm(() => {
               } : frontmatter;
               const file2 = {
                 filePath: commandPath,
-                baseDir: dirname49(commandPath),
+                baseDir: dirname50(commandPath),
                 frontmatter: finalFrontmatter,
                 content: markdownContent
               };
@@ -402271,7 +402996,7 @@ import {
   writeFile as writeFile25
 } from "fs/promises";
 import { tmpdir as tmpdir9 } from "os";
-import { basename as basename34, dirname as dirname51, join as join119 } from "path";
+import { basename as basename34, dirname as dirname52, join as join119 } from "path";
 function isPluginZipCacheEnabled() {
   return isEnvTruthy(process.env.UR_CODE_PLUGIN_USE_ZIP_CACHE);
 }
@@ -402334,7 +403059,7 @@ async function cleanupSessionPluginCache() {
   }
 }
 async function atomicWriteToZipCache(targetPath, data) {
-  const dir = dirname51(targetPath);
+  const dir = dirname52(targetPath);
   await getFsImplementation().mkdir(dir);
   const tmpName = `.${basename34(targetPath)}.tmp.${randomBytes13(4).toString("hex")}`;
   const tmpPath = join119(dir, tmpName);
@@ -402431,7 +403156,7 @@ async function extractZipToDirectory(zipPath, targetDir) {
       continue;
     }
     const fullPath = join119(targetDir, relPath);
-    await getFsImplementation().mkdir(dirname51(fullPath));
+    await getFsImplementation().mkdir(dirname52(fullPath));
     await writeFile25(fullPath, data);
     const mode = modes[relPath];
     if (mode && mode & 73) {
@@ -402927,7 +403652,7 @@ var init_marketplaceHelpers = __esm(() => {
 
 // src/utils/plugins/officialMarketplaceGcs.ts
 import { chmod as chmod9, mkdir as mkdir26, readFile as readFile36, rename as rename5, rm as rm7, writeFile as writeFile27 } from "fs/promises";
-import { dirname as dirname52, join as join121, resolve as resolve41, sep as sep26 } from "path";
+import { dirname as dirname53, join as join121, resolve as resolve41, sep as sep26 } from "path";
 async function fetchOfficialMarketplaceFromGcs(installLocation, marketplacesCacheDir) {
   if (!GCS_BASE) {
     return null;
@@ -402977,7 +403702,7 @@ async function fetchOfficialMarketplaceFromGcs(installLocation, marketplacesCach
       if (!rel || rel.endsWith("/"))
         continue;
       const dest = join121(staging, rel);
-      await mkdir26(dirname52(dest), { recursive: true });
+      await mkdir26(dirname53(dest), { recursive: true });
       await writeFile27(dest, data);
       const mode = modes[arcPath];
       if (mode && mode & 73) {
@@ -403056,7 +403781,7 @@ var init_officialMarketplaceGcs = __esm(() => {
 
 // src/utils/plugins/marketplaceManager.ts
 import { writeFile as writeFile28 } from "fs/promises";
-import { basename as basename35, dirname as dirname53, isAbsolute as isAbsolute31, join as join122, resolve as resolve42, sep as sep27 } from "path";
+import { basename as basename35, dirname as dirname54, isAbsolute as isAbsolute31, join as join122, resolve as resolve42, sep as sep27 } from "path";
 function getKnownMarketplacesFile() {
   return join122(getPluginsDirectory(), "known_marketplaces.json");
 }
@@ -403736,7 +404461,7 @@ async function loadAndCacheMarketplace(source, onProgress) {
       case "file": {
         const absPath = resolve42(source.path);
         marketplacePath = absPath;
-        temporaryCachePath = dirname53(dirname53(absPath));
+        temporaryCachePath = dirname54(dirname54(absPath));
         cleanupNeeded = false;
         break;
       }
@@ -403751,7 +404476,7 @@ async function loadAndCacheMarketplace(source, onProgress) {
         temporaryCachePath = join122(cacheDir, source.name);
         marketplacePath = join122(temporaryCachePath, ".ur-plugin", "marketplace.json");
         cleanupNeeded = false;
-        await fs4.mkdir(dirname53(marketplacePath));
+        await fs4.mkdir(dirname54(marketplacePath));
         await writeFile28(marketplacePath, jsonStringify({
           name: source.name,
           owner: source.owner ?? { name: "settings" },
@@ -404246,7 +404971,7 @@ var init_marketplaceManager = __esm(() => {
 });
 
 // src/utils/plugins/installedPluginsManager.ts
-import { dirname as dirname54, join as join123 } from "path";
+import { dirname as dirname55, join as join123 } from "path";
 function getInstalledPluginsFilePath() {
   return join123(getPluginsDirectory(), "installed_plugins.json");
 }
@@ -404812,7 +405537,7 @@ var init_pluginVersioning = __esm(() => {
 // src/utils/plugins/pluginInstallationHelpers.ts
 import { randomBytes as randomBytes14 } from "crypto";
 import { rename as rename6, rm as rm8 } from "fs/promises";
-import { dirname as dirname55, join as join124, resolve as resolve43, sep as sep28 } from "path";
+import { dirname as dirname56, join as join124, resolve as resolve43, sep as sep28 } from "path";
 function getCurrentTimestamp() {
   return new Date().toISOString();
 }
@@ -404836,14 +405561,14 @@ async function cacheAndRegisterPlugin(pluginId, entry, scope = "user", projectPa
   const versionedPath = getVersionedCachePath(pluginId, version2);
   let finalPath = cacheResult.path;
   if (cacheResult.path !== versionedPath) {
-    await getFsImplementation().mkdir(dirname55(versionedPath));
+    await getFsImplementation().mkdir(dirname56(versionedPath));
     await rm8(versionedPath, { recursive: true, force: true });
     const normalizedCachePath = cacheResult.path.endsWith(sep28) ? cacheResult.path : cacheResult.path + sep28;
     const isSubdirectory = versionedPath.startsWith(normalizedCachePath);
     if (isSubdirectory) {
-      const tempPath = join124(dirname55(cacheResult.path), `.ur-plugin-temp-${Date.now()}-${randomBytes14(4).toString("hex")}`);
+      const tempPath = join124(dirname56(cacheResult.path), `.ur-plugin-temp-${Date.now()}-${randomBytes14(4).toString("hex")}`);
       await rename6(cacheResult.path, tempPath);
-      await getFsImplementation().mkdir(dirname55(versionedPath));
+      await getFsImplementation().mkdir(dirname56(versionedPath));
       await rename6(tempPath, versionedPath);
     } else {
       await rename6(cacheResult.path, versionedPath);
@@ -405072,7 +405797,7 @@ import {
   stat as stat35,
   symlink as symlink3
 } from "fs/promises";
-import { basename as basename36, dirname as dirname56, join as join125, relative as relative31, resolve as resolve44, sep as sep29 } from "path";
+import { basename as basename36, dirname as dirname57, join as join125, relative as relative31, resolve as resolve44, sep as sep29 } from "path";
 function getPluginCachePath() {
   return join125(getPluginsDirectory(), "cache");
 }
@@ -405102,7 +405827,7 @@ async function probeSeedCache(pluginId, version2) {
 }
 async function probeSeedCacheAnyVersion(pluginId) {
   for (const seedDir of getPluginSeedDirs()) {
-    const pluginDir = dirname56(getVersionedCachePathIn(seedDir, pluginId, "_"));
+    const pluginDir = dirname57(getVersionedCachePathIn(seedDir, pluginId, "_"));
     try {
       const versions2 = await readdir21(pluginDir);
       if (versions2.length !== 1)
@@ -405144,7 +405869,7 @@ async function copyDir(src, dest) {
       if (resolvedTarget.startsWith(srcPrefix) || resolvedTarget === resolvedSrc) {
         const targetRelativeToSrc = relative31(resolvedSrc, resolvedTarget);
         const destTargetPath = join125(dest, targetRelativeToSrc);
-        const relativeLinkPath = relative31(dirname56(destPath), destTargetPath);
+        const relativeLinkPath = relative31(dirname57(destPath), destTargetPath);
         await symlink3(relativeLinkPath, destPath);
       } else {
         await symlink3(resolvedTarget, destPath);
@@ -405175,7 +405900,7 @@ async function copyPluginToVersionedCache(sourcePath, pluginId, version2, entry,
     logForDebugging(`Using seed cache for ${pluginId}@${version2} at ${seedPath}`);
     return seedPath;
   }
-  await getFsImplementation().mkdir(dirname56(cachePath));
+  await getFsImplementation().mkdir(dirname57(cachePath));
   if (entry && typeof entry.source === "string" && marketplaceDir) {
     const sourceDir = validatePathWithinBase(marketplaceDir, entry.source);
     logForDebugging(`Copying source directory ${entry.source} for plugin ${pluginId}`);
@@ -413611,7 +414336,7 @@ __export(exports_terminalSetup, {
 import { randomBytes as randomBytes16 } from "crypto";
 import { copyFile as copyFile8, mkdir as mkdir27, readFile as readFile38, writeFile as writeFile29 } from "fs/promises";
 import { homedir as homedir28, platform as platform4 } from "os";
-import { dirname as dirname57, join as join128 } from "path";
+import { dirname as dirname58, join as join128 } from "path";
 import { pathToFileURL as pathToFileURL7 } from "url";
 function isVSCodeRemoteSSH() {
   const askpassMain = process.env.VSCODE_GIT_ASKPASS_MAIN ?? "";
@@ -413933,7 +414658,7 @@ chars = "\\u001B\\r"`;
         return `${color("warning", theme)("Error backing up existing Alacritty config. Bailing out.")}${EOL5}${source_default.dim(`See ${formatPathLink(configPath)}`)}${EOL5}${source_default.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL5}`;
       }
     } else {
-      await mkdir27(dirname57(configPath), {
+      await mkdir27(dirname58(configPath), {
         recursive: true
       });
     }
@@ -416380,7 +417105,7 @@ var init_TextInput = __esm(() => {
 });
 
 // src/utils/suggestions/directoryCompletion.ts
-import { basename as basename40, dirname as dirname58, join as join131, sep as sep30 } from "path";
+import { basename as basename40, dirname as dirname59, join as join131, sep as sep30 } from "path";
 function parsePartialPath(partialPath, basePath) {
   if (!partialPath) {
     const directory2 = basePath || getCwd();
@@ -416390,7 +417115,7 @@ function parsePartialPath(partialPath, basePath) {
   if (partialPath.endsWith("/") || partialPath.endsWith(sep30)) {
     return { directory: resolved, prefix: "" };
   }
-  const directory = dirname58(resolved);
+  const directory = dirname59(resolved);
   const prefix = basename40(partialPath);
   return { directory, prefix };
 }
@@ -418319,7 +419044,7 @@ function Feedback({
       platform: env2.platform,
       gitRepo: envInfo.isGit,
       terminal: env2.terminal,
-      version: "1.65.10",
+      version: "1.65.12",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -418511,7 +419236,7 @@ function Feedback({
                       ", ",
                       env2.terminal,
                       ", v",
-                      "1.65.10"
+                      "1.65.12"
                     ]
                   }, undefined, true, undefined, this)
                 ]
@@ -418617,7 +419342,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env2.platform}
 ` + `- Terminal: ${env2.terminal}
-` + `- Version: ${"1.65.10"}
+` + `- Version: ${"1.65.12"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -421727,7 +422452,7 @@ function buildPrimarySection() {
   }, undefined, false, undefined, this);
   return [{
     label: "Version",
-    value: "1.65.10"
+    value: "1.65.12"
   }, {
     label: "Session name",
     value: nameValue
@@ -425057,7 +425782,7 @@ function Config({
         }
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_dev_runtime179.jsxDEV(ChannelDowngradeDialog, {
-      currentVersion: "1.65.10",
+      currentVersion: "1.65.12",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -425069,7 +425794,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "1.65.10";
+          newSettings.minimumVersion = "1.65.12";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -433133,7 +433858,7 @@ function HelpV2(t0) {
   let t6;
   if ($2[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_dev_runtime206.jsxDEV(Tabs, {
-      title: `UR v${"1.65.10"}`,
+      title: `UR v${"1.65.12"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -434066,7 +434791,7 @@ function buildToolUseContext(tools, readFileStateCache, toolPermissionContext, a
 async function handleInitialize(options2) {
   return {
     name: "UR",
-    version: "1.65.10",
+    version: "1.65.12",
     protocolVersion: "0.1.0",
     workspaceRoot: options2.cwd,
     capabilities: {
@@ -436108,7 +436833,7 @@ __export(exports_keybindings, {
   call: () => call24
 });
 import { mkdir as mkdir32, writeFile as writeFile34 } from "fs/promises";
-import { dirname as dirname60 } from "path";
+import { dirname as dirname61 } from "path";
 async function call24() {
   if (!isKeybindingCustomizationEnabled()) {
     return {
@@ -436118,7 +436843,7 @@ async function call24() {
   }
   const keybindingsPath = getKeybindingsPath();
   let fileExists = false;
-  await mkdir32(dirname60(keybindingsPath), { recursive: true });
+  await mkdir32(dirname61(keybindingsPath), { recursive: true });
   try {
     await writeFile34(keybindingsPath, generateKeybindingsTemplate(), {
       encoding: "utf-8",
@@ -443745,7 +444470,7 @@ var init_DiscoverPlugins = __esm(() => {
 });
 
 // src/services/plugins/pluginOperations.ts
-import { dirname as dirname61, join as join142 } from "path";
+import { dirname as dirname62, join as join142 } from "path";
 function assertInstallableScope(scope) {
   if (!VALID_INSTALLABLE_SCOPES.includes(scope)) {
     throw new Error(`Invalid scope "${scope}". Must be one of: ${VALID_INSTALLABLE_SCOPES.join(", ")}`);
@@ -444222,7 +444947,7 @@ async function performPluginUpdate({
       }
       throw e;
     }
-    const marketplaceDir = marketplaceStats.isDirectory() ? marketplaceInstallLocation : dirname61(marketplaceInstallLocation);
+    const marketplaceDir = marketplaceStats.isDirectory() ? marketplaceInstallLocation : dirname62(marketplaceInstallLocation);
     sourcePath = join142(marketplaceDir, entry.source);
     try {
       await fs4.stat(sourcePath);
@@ -451054,7 +451779,7 @@ ${args ? "Additional user input: " + args : ""}
 
 // src/utils/releaseNotes.ts
 import { mkdir as mkdir33, readFile as readFile45, writeFile as writeFile37 } from "fs/promises";
-import { dirname as dirname63, join as join146 } from "path";
+import { dirname as dirname64, join as join146 } from "path";
 function getChangelogCachePath() {
   return join146(getURConfigHomeDir(), "cache", "changelog.md");
 }
@@ -451065,7 +451790,7 @@ async function migrateChangelogFromConfig() {
   }
   const cachePath = getChangelogCachePath();
   try {
-    await mkdir33(dirname63(cachePath), { recursive: true });
+    await mkdir33(dirname64(cachePath), { recursive: true });
     await writeFile37(cachePath, config3.cachedChangelog, {
       encoding: "utf-8",
       flag: "wx"
@@ -451087,7 +451812,7 @@ async function fetchAndStoreChangelog() {
       return;
     }
     const cachePath = getChangelogCachePath();
-    await mkdir33(dirname63(cachePath), { recursive: true });
+    await mkdir33(dirname64(cachePath), { recursive: true });
     await writeFile37(cachePath, changelogContent, { encoding: "utf-8" });
     changelogMemoryCache = changelogContent;
     const changelogLastFetched = Date.now();
@@ -451174,7 +451899,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.10") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.12") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -451201,7 +451926,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.65.10")
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.65.10") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.65.12") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -454067,7 +454792,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version2 = process.env.DEMO_VERSION ?? "1.65.10";
+  const version2 = process.env.DEMO_VERSION ?? "1.65.12";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/ur" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -454934,7 +455659,7 @@ function LogoV2() {
   if ($2[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig2 = getGlobalConfig();
-      if (currentConfig2.lastReleaseNotesSeen === "1.65.10") {
+      if (currentConfig2.lastReleaseNotesSeen === "1.65.12") {
         return;
       }
       saveGlobalConfig(_temp325);
@@ -455619,12 +456344,12 @@ function LogoV2() {
   return t41;
 }
 function _temp325(current) {
-  if (current.lastReleaseNotesSeen === "1.65.10") {
+  if (current.lastReleaseNotesSeen === "1.65.12") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "1.65.10"
+    lastReleaseNotesSeen: "1.65.12"
   };
 }
 function _temp241(s_0) {
@@ -461896,7 +462621,7 @@ import {
   readFileSync as readFileSync34,
   statSync as statSync14
 } from "fs";
-import { dirname as dirname64, isAbsolute as isAbsolute33, resolve as resolve51 } from "path";
+import { dirname as dirname65, isAbsolute as isAbsolute33, resolve as resolve51 } from "path";
 function validateTranscriptContent(content) {
   const errors4 = [];
   let messageCount = 0;
@@ -461952,7 +462677,7 @@ function importSessionFile(sourcePath) {
   while (sessionIdExists(sessionId))
     sessionId = randomUUID46();
   const target = getTranscriptPathForSession(sessionId);
-  mkdirSync21(dirname64(target), { recursive: true });
+  mkdirSync21(dirname65(target), { recursive: true });
   copyFileSync2(source, target);
   return { sessionId, path: target, messageCount: validation.messageCount };
 }
@@ -469587,7 +470312,7 @@ var init_attackSurface = __esm(() => {
 
 // src/security/findings.ts
 import * as fs7 from "fs";
-import { dirname as dirname65, join as join151 } from "path";
+import { dirname as dirname66, join as join151 } from "path";
 function severityRank(s) {
   return ORDER.indexOf(s);
 }
@@ -469605,7 +470330,7 @@ class FindingStore {
     }
   }
   persist() {
-    fs7.mkdirSync(dirname65(this.file), { recursive: true });
+    fs7.mkdirSync(dirname66(this.file), { recursive: true });
     fs7.writeFileSync(this.file, JSON.stringify(this.findings, null, 2));
   }
   add(items) {
@@ -471625,7 +472350,7 @@ import {
   writeFileSync as writeFileSync26
 } from "fs";
 import { tmpdir as tmpdir12 } from "os";
-import { dirname as dirname66, isAbsolute as isAbsolute35, join as join157, relative as relative40, resolve as resolve55, sep as sep39 } from "path";
+import { dirname as dirname67, isAbsolute as isAbsolute35, join as join157, relative as relative40, resolve as resolve55, sep as sep39 } from "path";
 function positiveInteger(value, min, max2) {
   return typeof value === "number" && Number.isInteger(value) && value >= min && value <= max2;
 }
@@ -472156,7 +472881,7 @@ function manifestPathFor(dir, runId) {
   return join157(dir, runId, "manifest.json");
 }
 function writeAgenticCiResult(result) {
-  mkdirSync27(dirname66(result.manifestPath), { recursive: true });
+  mkdirSync27(dirname67(result.manifestPath), { recursive: true });
   writeFileSync26(result.manifestPath, `${JSON.stringify(result, null, 2)}
 `, {
     mode: 384
@@ -472452,7 +473177,7 @@ async function runAgenticCi(options2) {
   let patch;
   if (diff2.trim() && violations.length === 0) {
     const digest3 = sha2562(diff2);
-    const runDir = dirname66(manifestPath5);
+    const runDir = dirname67(manifestPath5);
     mkdirSync27(runDir, { recursive: true });
     const patchPath = join157(runDir, `patch-${digest3}.diff`);
     writeFileSync26(patchPath, diff2, { mode: 384 });
@@ -472548,7 +473273,7 @@ function saveAgenticCiSpec(cwd2, spec, options2 = {}) {
   if (!validation.valid)
     throw new Error(validation.errors.join("; "));
   const path22 = agenticCiSpecPath(cwd2, spec.name);
-  mkdirSync27(dirname66(path22), { recursive: true });
+  mkdirSync27(dirname67(path22), { recursive: true });
   if (existsSync41(path22) && !options2.force)
     return { path: path22, created: false };
   writeFileSync26(path22, import_yaml3.stringify(spec), { mode: 384 });
@@ -472564,7 +473289,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.10" : "1.65.10");
+  const packageVersion = options2.packageVersion ?? (typeof MACRO !== "undefined" ? "1.65.12" : "1.65.12");
   if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(packageVersion)) {
     throw new Error("invalid ur-agent package version");
   }
@@ -472903,12 +473628,12 @@ var init_agenticCi = __esm(() => {
 
 // src/services/agents/featureScaffolds.ts
 import { existsSync as existsSync42, mkdirSync as mkdirSync28, writeFileSync as writeFileSync27 } from "fs";
-import { dirname as dirname67, join as join158 } from "path";
+import { dirname as dirname68, join as join158 } from "path";
 function writeSeedFile(root2, file2, result, force) {
-  const baseRoot = file2.root === "project" ? dirname67(root2) : root2;
+  const baseRoot = file2.root === "project" ? dirname68(root2) : root2;
   const fullPath = join158(baseRoot, file2.path);
   const displayPath = file2.path;
-  mkdirSync28(dirname67(fullPath), { recursive: true });
+  mkdirSync28(dirname68(fullPath), { recursive: true });
   if (!force && existsSync42(fullPath)) {
     result.skipped.push(displayPath);
     return;
@@ -473557,7 +474282,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.10" : "1.65.10"
+        packageVersion: typeof MACRO !== "undefined" ? "1.65.12" : "1.65.12"
       })
     },
     {
@@ -473621,13 +474346,13 @@ __export(exports_agent_ci, {
   call: () => call56
 });
 import { existsSync as existsSync43, mkdirSync as mkdirSync29, writeFileSync as writeFileSync28 } from "fs";
-import { dirname as dirname68, join as join159 } from "path";
+import { dirname as dirname69, join as join159 } from "path";
 function value(tokens, flag) {
   const index2 = tokens.indexOf(flag);
   return index2 >= 0 ? tokens[index2 + 1] : undefined;
 }
 function cliVersion() {
-  return typeof MACRO !== "undefined" ? "1.65.10" : "1.65.10";
+  return typeof MACRO !== "undefined" ? "1.65.12" : "1.65.12";
 }
 function workflowPath(cwd2) {
   return join159(cwd2, ".github", "workflows", "ur-agentic-ci.yml");
@@ -473685,7 +474410,7 @@ var call56 = async (args) => {
     const target = workflowPath(cwd2);
     let workflowCreated = false;
     if (!existsSync43(target) || force) {
-      mkdirSync29(dirname68(target), { recursive: true });
+      mkdirSync29(dirname69(target), { recursive: true });
       writeFileSync28(target, compileAgenticCiWorkflow(name, {
         packageVersion: cliVersion(),
         spec: compiledSpec
@@ -473730,7 +474455,7 @@ Use --force to replace it.`
         value: json2 ? JSON.stringify(result, null, 2) : `${result.replacing ? "Would replace" : "Would write"} hardened workflow at ${target}`
       };
     }
-    mkdirSync29(dirname68(target), { recursive: true });
+    mkdirSync29(dirname69(target), { recursive: true });
     writeFileSync28(target, compileAgenticCiWorkflow(name, {
       packageVersion: cliVersion(),
       spec: workflowSpec
@@ -479492,7 +480217,7 @@ function createAcpStdioApp(deps) {
       }
     },
     authMethods: [],
-    agentInfo: { name: "UR-Nexus", version: "1.65.10" }
+    agentInfo: { name: "UR-Nexus", version: "1.65.12" }
   })).onRequest("authenticate", () => ({})).onRequest("session/new", async (context6) => {
     const result = runtime2.newSession(context6.params.cwd, context6.params.mcpServers, context6.params.additionalDirectories);
     await runtime2.announce({
@@ -479589,7 +480314,7 @@ function createAcpStdioAgent(deps) {
               }
             },
             authMethods: [],
-            agentInfo: { name: "UR-Nexus", version: "1.65.10" }
+            agentInfo: { name: "UR-Nexus", version: "1.65.12" }
           });
           return;
         case "authenticate":
@@ -481362,7 +482087,7 @@ var init_validation5 = () => {};
 
 // src/services/promptPlanning/executor.ts
 import { realpathSync as realpathSync13 } from "fs";
-import { basename as basename45, dirname as dirname69, resolve as resolve56 } from "path";
+import { basename as basename45, dirname as dirname70, resolve as resolve56 } from "path";
 function cloneTasks(tasks2) {
   return tasks2.map((task) => ({
     ...task,
@@ -481394,7 +482119,7 @@ function canonicalLockKey(cwd2, value2) {
     const suffix = [];
     let current = absolute;
     for (;; ) {
-      const parent2 = dirname69(current);
+      const parent2 = dirname70(current);
       if (parent2 === current)
         return absolute;
       suffix.unshift(basename45(current));
@@ -482643,7 +483368,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) {
@@ -482670,46 +483395,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}`)
@@ -486013,7 +486738,7 @@ import {
   writeFileSync as writeFileSync36
 } from "fs";
 import { homedir as homedir32 } from "os";
-import { dirname as dirname70, isAbsolute as isAbsolute39, join as join171, resolve as resolve58, sep as pathSep3 } from "path";
+import { dirname as dirname71, isAbsolute as isAbsolute39, join as join171, resolve as resolve58, sep as pathSep3 } from "path";
 function parseCommandTokens(tokens) {
   const positional = [];
   const flags = new Set;
@@ -486081,7 +486806,7 @@ function readPrivateKey(path22) {
 }
 function writeTrustedKeys(keys2) {
   const path22 = trustedSkillKeysPath();
-  mkdirSync37(dirname70(path22), { recursive: true, mode: 448 });
+  mkdirSync37(dirname71(path22), { recursive: true, mode: 448 });
   const temporary = `${path22}.${process.pid}.${randomUUID52()}.tmp`;
   try {
     writeFileSync36(temporary, `${JSON.stringify(keys2, null, 2)}
@@ -486164,7 +486889,7 @@ var VALUE_OPTIONS, call70 = async (args) => {
       const { privateKey, publicKey } = generateKeyPairSync2("ed25519");
       const privatePem = privateKey.export({ type: "pkcs8", format: "pem" });
       const publicPem = publicKey.export({ type: "spki", format: "pem" }).toString();
-      mkdirSync37(dirname70(privatePath), { recursive: true, mode: 448 });
+      mkdirSync37(dirname71(privatePath), { recursive: true, mode: 448 });
       writeFileSync36(privatePath, privatePem, { flag: "wx", mode: 384 });
       createdPrivate = true;
       writeFileSync36(publicPath, publicPem, { flag: "wx", mode: 420 });
@@ -487134,7 +487859,7 @@ import {
   writeFileSync as writeFileSync39
 } from "fs";
 import { tmpdir as tmpdir14 } from "os";
-import { dirname as dirname71, join as join175 } from "path";
+import { dirname as dirname72, join as join175 } from "path";
 function redactArenaText(value2) {
   return redactAgenticCiText(value2);
 }
@@ -487608,7 +488333,7 @@ async function applyWinner(cwd2, baseSha, runId, winner) {
   }
   const digest3 = sha2563(winner.diff);
   const patch = join175(cwd2, ".ur", "arena", runId, `winner-${digest3}.patch`);
-  mkdirSync39(dirname71(patch), { recursive: true });
+  mkdirSync39(dirname72(patch), { recursive: true });
   writeFileSync39(patch, winner.diff, { mode: 384 });
   const check3 = await git4(cwd2, ["apply", "--check", "--3way", patch]);
   if (check3.code !== 0) {
@@ -490347,17 +491072,17 @@ __export(exports_agent_inspect, {
   call: () => call78
 });
 import { readdirSync as readdirSync23, statSync as statSync23 } from "fs";
-import { dirname as dirname72, join as join183 } from "path";
+import { dirname as dirname73, join as join183 } from "path";
 function resolveSessionSubagentsDir() {
   let live;
   try {
-    live = dirname72(getAgentTranscriptPath("probe"));
+    live = dirname73(getAgentTranscriptPath("probe"));
   } catch {
     return null;
   }
   if (hasTranscripts(live))
     return live;
-  const projectDir = dirname72(dirname72(live));
+  const projectDir = dirname73(dirname73(live));
   let sessions;
   try {
     sessions = readdirSync23(projectDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join183(projectDir, entry.name, "subagents")).filter(hasTranscripts);
@@ -490701,7 +491426,7 @@ var init_memoryIntegrity = __esm(() => {
 });
 
 // src/memdir/teamMemPaths.ts
-import { dirname as dirname73, join as join185, resolve as resolve60, sep as sep43 } from "path";
+import { dirname as dirname74, join as join185, resolve as resolve60, sep as sep43 } from "path";
 function getTeamMemPath() {
   return (join185(getAutoMemPath(), "team") + sep43).normalize("NFC");
 }
@@ -496982,7 +497707,7 @@ import {
   writeFileSync as writeFileSync54
 } from "fs";
 import {
-  dirname as dirname74,
+  dirname as dirname75,
   isAbsolute as isAbsolute43,
   join as join198,
   relative as relative48,
@@ -497027,7 +497752,7 @@ function existingAncestor(path22) {
   for (;; ) {
     if (existsSync77(current))
       return realpathSync15(current);
-    const parent2 = dirname74(current);
+    const parent2 = dirname75(current);
     if (parent2 === current)
       return current;
     current = parent2;
@@ -497037,7 +497762,7 @@ function initTargetAllowed(cwd2, path22, allowExternal) {
   if (allowExternal)
     return true;
   const workspace = realpathSync15(cwd2);
-  return pathIsWithin4(workspace, resolve64(path22)) && pathIsWithin4(workspace, existingAncestor(dirname74(path22)));
+  return pathIsWithin4(workspace, resolve64(path22)) && pathIsWithin4(workspace, existingAncestor(dirname75(path22)));
 }
 async function runDesktopQaCommand(args, cwd2, dependencies = {}) {
   const runFixture = dependencies.runFixture ?? runDesktopQaFixture;
@@ -497127,7 +497852,7 @@ async function runDesktopQaCommand(args, cwd2, dependencies = {}) {
         value: `Fixture already exists: ${path22} (use --force to replace it).`
       };
     }
-    mkdirSync54(dirname74(path22), { recursive: true, mode: 448 });
+    mkdirSync54(dirname75(path22), { recursive: true, mode: 448 });
     writeFileSync54(path22, `${JSON.stringify(EXAMPLE_FIXTURE, null, 2)}
 `, {
       mode: 384
@@ -498011,7 +498736,7 @@ import {
   readFileSync as readFileSync72,
   writeFileSync as writeFileSync55
 } from "fs";
-import { dirname as dirname75, join as join199, relative as relative49 } from "path";
+import { dirname as dirname76, join as join199, relative as relative49 } from "path";
 function defaultTraceDir(cwd2) {
   return join199(cwd2, ".ur", "test-first", "traces");
 }
@@ -498064,7 +498789,7 @@ function mergeStringArray(existing2, additions) {
 }
 function installTestFirstGates(cwd2, stack = detectTestFirstStack(cwd2)) {
   const path22 = join199(cwd2, ".ur", "verify.json");
-  mkdirSync55(dirname75(path22), { recursive: true });
+  mkdirSync55(dirname76(path22), { recursive: true });
   const commands = stack.commands.map((command5) => command5.command);
   const existing2 = readExistingVerifyConfig(path22);
   const next = {
@@ -502475,7 +503200,7 @@ var init_os2 = __esm(() => {
 import { createHash as createHash47, randomUUID as randomUUID59 } from "crypto";
 import { existsSync as existsSync83, lstatSync as lstatSync20, realpathSync as realpathSync16, rmSync as rmSync18 } from "fs";
 import { tmpdir as tmpdir16 } from "os";
-import { dirname as dirname76, isAbsolute as isAbsolute44, join as join204, relative as relative50, resolve as resolve66 } from "path";
+import { dirname as dirname77, isAbsolute as isAbsolute44, join as join204, relative as relative50, resolve as resolve66 } from "path";
 function workspaceDir(cwd2) {
   return join204(cwd2, ".ur", "workspaces");
 }
@@ -502884,7 +503609,7 @@ async function prepareRepositoryState(cwd2, spec2, validation, runId, options3)
       if (filters.code !== 0 && filters.code !== 1) {
         throw new Error(`Could not inspect ${repo.id} Git filters`);
       }
-      ensurePrivateDirectory(workspaceDir(cwd2), dirname76(worktree2));
+      ensurePrivateDirectory(workspaceDir(cwd2), dirname77(worktree2));
       const created = await git7(details.root, ["worktree", "add", "-b", branch, worktree2, repo.baseRef], options3.commandRunner);
       if (created.code !== 0) {
         throw new Error(`Could not create ${repo.id} worktree: ${created.stderr || created.error || created.stdout}`);
@@ -502981,7 +503706,7 @@ async function runWorkspace(cwd2, name, options3 = {}) {
     const persist = () => {
       state.updatedAt = new Date().toISOString();
       if (!options3.dryRun) {
-        ensurePrivateDirectory(workspaceDir(cwd2), dirname76(workspaceStatePath(cwd2, name)));
+        ensurePrivateDirectory(workspaceDir(cwd2), dirname77(workspaceStatePath(cwd2, name)));
         withPrivateStateLock(workspaceDir(cwd2), `state-${name}`, () => saveState(cwd2, state));
       }
     };
@@ -503642,7 +504367,7 @@ import {
   readdirSync as readdirSync32,
   writeFileSync as writeFileSync59
 } from "fs";
-import { dirname as dirname77, join as join205 } from "path";
+import { dirname as dirname78, join as join205 } from "path";
 function memoryDir(cwd2) {
   return join205(cwd2, ".ur", "memory");
 }
@@ -503677,7 +504402,7 @@ function saveMemoryRetentionPolicy(cwd2, patch) {
     decayDays: patch.decayDays === undefined ? current.decayDays : validPositive(patch.decayDays),
     updatedAt: new Date().toISOString()
   };
-  mkdirSync59(dirname77(policyPath2(cwd2)), { recursive: true });
+  mkdirSync59(dirname78(policyPath2(cwd2)), { recursive: true });
   writeFileSync59(policyPath2(cwd2), `${JSON.stringify(next, null, 2)}
 `);
   return next;
@@ -673368,7 +674093,7 @@ import {
   statSync as statSync29,
   writeFileSync as writeFileSync61
 } from "fs";
-import { dirname as dirname78, extname as extname19, isAbsolute as isAbsolute45, join as join207, relative as relative52, resolve as resolve67 } from "path";
+import { dirname as dirname79, extname as extname19, isAbsolute as isAbsolute45, join as join207, relative as relative52, resolve as resolve67 } from "path";
 import { promisify as promisify4 } from "util";
 function repoEditIndexPath(root2) {
   return join207(root2, ".ur", "repo-edit", "index.json");
@@ -673508,7 +674233,7 @@ ${content}`),
     builtAt: new Date().toISOString(),
     files
   };
-  mkdirSync61(dirname78(repoEditIndexPath(root2)), { recursive: true });
+  mkdirSync61(dirname79(repoEditIndexPath(root2)), { recursive: true });
   writeFileSync61(repoEditIndexPath(root2), `${JSON.stringify(index2, null, 2)}
 `);
   return index2;
@@ -674185,7 +674910,7 @@ var init_diagnostics = __esm(() => {
 });
 
 // src/services/repoEditing/ast/workspaceEdit.ts
-import { dirname as dirname79, isAbsolute as isAbsolute46, relative as relative53, resolve as resolve68, sep as sep47 } from "path";
+import { dirname as dirname80, isAbsolute as isAbsolute46, relative as relative53, resolve as resolve68, sep as sep47 } from "path";
 import {
   chmodSync as chmodSync11,
   existsSync as existsSync87,
@@ -674236,7 +674961,7 @@ function realpathForMissing(path22) {
   const suffix = [];
   let cursor = path22;
   while (!existsSync87(cursor)) {
-    const parent2 = dirname79(cursor);
+    const parent2 = dirname80(cursor);
     if (parent2 === cursor)
       return path22;
     suffix.unshift(cursor.slice(parent2.length + (parent2.endsWith(sep47) ? 0 : 1)));
@@ -674266,8 +674991,8 @@ function workspaceRelativePath(root2, file2) {
   return relative53(realpathSync17(root2), resolveWorkspaceFile(root2, file2)).split(sep47).join("/");
 }
 function atomicWrite(path22, content, mode) {
-  mkdirSync62(dirname79(path22), { recursive: true });
-  const temp = resolve68(dirname79(path22), `.${randomUUID60()}.ur-repo-edit.tmp`);
+  mkdirSync62(dirname80(path22), { recursive: true });
+  const temp = resolve68(dirname80(path22), `.${randomUUID60()}.ur-repo-edit.tmp`);
   try {
     writeFileSync62(temp, content, { flag: "wx", ...mode !== undefined ? { mode } : {} });
     renameSync17(temp, path22);
@@ -674316,14 +675041,14 @@ function rollbackWorkspaceEdit(root2, snapshots) {
       continue;
     }
     rmSync19(abs, { force: true, recursive: true });
-    let parent2 = dirname79(abs);
+    let parent2 = dirname80(abs);
     while (parent2 !== realRoot && isWithin(realRoot, parent2)) {
       try {
         rmdirSync2(parent2);
       } catch {
         break;
       }
-      parent2 = dirname79(parent2);
+      parent2 = dirname80(parent2);
     }
   }
 }
@@ -674471,7 +675196,7 @@ var init_lspEditEngine = __esm(() => {
 });
 
 // src/services/repoEditing/ast/typescriptEngine.ts
-import { dirname as dirname80, join as join209, relative as relative54 } from "path";
+import { dirname as dirname81, join as join209, relative as relative54 } from "path";
 import { existsSync as existsSync88, readFileSync as readFileSync81 } from "fs";
 function loadProgram(root2, files) {
   const configPath2 = import_typescript3.default.findConfigFile(root2, import_typescript3.default.sys.fileExists, "tsconfig.json");
@@ -674732,11 +675457,11 @@ function normalizePath4(value2) {
 function resolveRelativeImport(importingFileRel, specifier) {
   if (!specifier.startsWith("."))
     return;
-  const base2 = normalizePath4(join209(dirname80(importingFileRel), specifier));
+  const base2 = normalizePath4(join209(dirname81(importingFileRel), specifier));
   return stripKnownExtension(base2);
 }
 function moduleSpecifierBetween(importingFileRel, targetFileRel) {
-  let specifier = normalizePath4(relative54(dirname80(importingFileRel), stripKnownExtension(targetFileRel)));
+  let specifier = normalizePath4(relative54(dirname81(importingFileRel), stripKnownExtension(targetFileRel)));
   if (!specifier.startsWith("."))
     specifier = `./${specifier}`;
   return specifier;
@@ -676702,7 +677427,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";
@@ -676733,7 +677458,7 @@ var call127 = async (args) => {
         })), null, 2)
       };
     }
-    return { type: "text", value: formatList2() };
+    return { type: "text", value: formatList3() };
   }
   if (command5 === "show") {
     const name = positional2[1];
@@ -690749,7 +691474,7 @@ async function captureMemoryDiagnostics(trigger2, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "1.65.10"
+    ccVersion: "1.65.12"
   };
 }
 async function performHeapDump(trigger2 = "manual", dumpNumber = 0) {
@@ -691329,7 +692054,7 @@ var init_bridge_kick = __esm(() => {
 var call153 = async () => {
   return {
     type: "text",
-    value: "1.65.10"
+    value: "1.65.12"
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -693516,7 +694241,7 @@ var init_advisor2 = __esm(() => {
 // src/skills/bundledSkills.ts
 import { constants as fsConstants6 } from "fs";
 import { mkdir as mkdir38, open as open15 } from "fs/promises";
-import { dirname as dirname81, isAbsolute as isAbsolute52, join as join223, normalize as normalize16, sep as pathSep4 } from "path";
+import { dirname as dirname82, isAbsolute as isAbsolute52, join as join223, normalize as normalize16, sep as pathSep4 } from "path";
 function registerBundledSkill(definition) {
   const { files: files2 } = definition;
   let skillRoot;
@@ -693580,7 +694305,7 @@ async function writeSkillFiles(dir, files2) {
   const byParent = new Map;
   for (const [relPath, content] of Object.entries(files2)) {
     const target = resolveSkillFilePath(dir, relPath);
-    const parent2 = dirname81(target);
+    const parent2 = dirname82(target);
     const entry = [target, content];
     const group = byParent.get(parent2);
     if (group)
@@ -693963,7 +694688,7 @@ var init_exit2 = __esm(() => {
 // src/utils/exportPath.ts
 import { existsSync as existsSync99, lstatSync as lstatSync23, realpathSync as realpathSync22 } from "fs";
 import {
-  dirname as dirname82,
+  dirname as dirname83,
   extname as extname23,
   isAbsolute as isAbsolute53,
   relative as relative61,
@@ -694001,7 +694726,7 @@ function resolveExportPath(cwd2, input) {
   const root2 = realpathSync22(cwd2);
   const filename = normalizeExportFilename(trimmed);
   const target = resolve73(root2, filename);
-  const parent2 = realpathSync22(dirname82(target));
+  const parent2 = realpathSync22(dirname83(target));
   if (escapes(root2, parent2)) {
     throw new Error("Export path resolves outside the workspace");
   }
@@ -702509,7 +703234,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version3 = typeof MACRO !== "undefined" ? "1.65.10" : "unknown";
+  const version3 = typeof MACRO !== "undefined" ? "1.65.12" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h2) => h2.sessionCount > 0).map((h2) => h2.name);
   const facets_summary = {
     total: facets.size,
@@ -703971,7 +704696,7 @@ import {
   unlink as unlink23,
   writeFile as writeFile44
 } from "fs/promises";
-import { basename as basename51, dirname as dirname84, join as join228 } from "path";
+import { basename as basename51, dirname as dirname85, join as join228 } from "path";
 function isTranscriptMessage(entry) {
   const t = entry.type;
   return t === "user" || t === "assistant" || t === "attachment" || t === "system";
@@ -704020,7 +704745,7 @@ function getAgentMetadataPath(agentId) {
 }
 async function writeAgentMetadata(agentId, metadata) {
   const path22 = getAgentMetadataPath(agentId);
-  await mkdir41(dirname84(path22), { recursive: true });
+  await mkdir41(dirname85(path22), { recursive: true });
   await writeFile44(path22, JSON.stringify(metadata));
 }
 async function readAgentMetadata(agentId) {
@@ -704043,7 +704768,7 @@ function getRemoteAgentMetadataPath(taskId) {
 }
 async function writeRemoteAgentMetadata(taskId, metadata) {
   const path22 = getRemoteAgentMetadataPath(taskId);
-  await mkdir41(dirname84(path22), { recursive: true });
+  await mkdir41(dirname85(path22), { recursive: true });
   await writeFile44(path22, JSON.stringify(metadata));
 }
 async function readRemoteAgentMetadata(taskId) {
@@ -704251,7 +704976,7 @@ class Project {
     try {
       await fsAppendFile(filePath, data, { mode: 384 });
     } catch {
-      await mkdir41(dirname84(filePath), { recursive: true, mode: 448 });
+      await mkdir41(dirname85(filePath), { recursive: true, mode: 448 });
       await fsAppendFile(filePath, data, { mode: 384 });
     }
   }
@@ -704865,7 +705590,7 @@ async function hydrateFromCCRv2InternalEvents(sessionId) {
         }
         for (const [agentId, entries] of byAgent) {
           const agentFile = getAgentTranscriptPath(asAgentId(agentId));
-          await mkdir41(dirname84(agentFile), { recursive: true, mode: 448 });
+          await mkdir41(dirname85(agentFile), { recursive: true, mode: 448 });
           const agentContent = entries.map((p2) => jsonStringify(p2) + `
 `).join("");
           await writeFile44(agentFile, agentContent, {
@@ -705402,7 +706127,7 @@ function appendEntryToFile(fullPath, entry) {
   try {
     fs12.appendFileSync(fullPath, line, { mode: 384 });
   } catch {
-    fs12.mkdirSync(dirname84(fullPath), { mode: 448 });
+    fs12.mkdirSync(dirname85(fullPath), { mode: 448 });
     fs12.appendFileSync(fullPath, line, { mode: 384 });
   }
 }
@@ -706836,7 +707561,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION7 = typeof MACRO !== "undefined" ? "1.65.10" : "unknown";
+  VERSION7 = typeof MACRO !== "undefined" ? "1.65.12" : "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([
@@ -708051,7 +708776,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes20(16).toString("hex");
-    return join230(getURTempDir(), "bundled-skills", "1.65.10", nonce);
+    return join230(getURTempDir(), "bundled-skills", "1.65.12", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -712619,7 +713344,7 @@ import {
   symlink as symlink5,
   utimes as utimes2
 } from "fs/promises";
-import { basename as basename53, dirname as dirname85, join as join232 } from "path";
+import { basename as basename53, dirname as dirname86, join as join232 } from "path";
 function validateWorktreeSlug(slug5) {
   if (slug5.length > MAX_WORKTREE_SLUG_LENGTH) {
     throw new Error(`Invalid worktree name: must be ${MAX_WORKTREE_SLUG_LENGTH} characters or fewer (got ${slug5.length})`);
@@ -712815,7 +713540,7 @@ async function copyWorktreeIncludeFiles(repoRoot, worktreePath) {
     const srcPath = join232(repoRoot, relativePath3);
     const destPath = join232(worktreePath, relativePath3);
     try {
-      await mkdir43(dirname85(destPath), { recursive: true });
+      await mkdir43(dirname86(destPath), { recursive: true });
       await copyFile10(srcPath, destPath);
       copied.push(relativePath3);
     } catch (e) {
@@ -712832,7 +713557,7 @@ async function performPostCreationSetup(repoRoot, worktreePath) {
   const sourceSettingsLocal = join232(repoRoot, localSettingsRelativePath);
   try {
     const destSettingsLocal = join232(worktreePath, localSettingsRelativePath);
-    await mkdirRecursive(dirname85(destSettingsLocal));
+    await mkdirRecursive(dirname86(destSettingsLocal));
     await copyFile10(sourceSettingsLocal, destSettingsLocal);
     logForDebugging(`Copied settings.local.json to worktree: ${destSettingsLocal}`);
   } catch (e) {
@@ -714379,7 +715104,7 @@ function computeFingerprint(messageText2, version3) {
 }
 function computeFingerprintFromMessages(messages) {
   const firstMessageText = extractFirstMessageText(messages);
-  return computeFingerprint(firstMessageText, "1.65.10");
+  return computeFingerprint(firstMessageText, "1.65.12");
 }
 var FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = () => {};
@@ -714774,7 +715499,9 @@ function getNonstreamingFallbackTimeoutMs(model, env4 = process.env, provider =
   const override = parseInt(env4.API_TIMEOUT_MS || "", 10);
   if (override)
     return override;
-  return isEnvTruthy(env4.UR_CODE_REMOTE) || isOllamaCloudRuntime(model, provider) ? 120000 : 300000;
+  if (isEnvTruthy(env4.UR_CODE_REMOTE))
+    return 120000;
+  return provider === "ollama" ? getOllamaModelDefaultTimeoutMs(model) : 300000;
 }
 function shouldSkipOllamaNonStreamingFallback(error40, model, provider = getAPIProvider()) {
   return isOllamaCloudRuntime(model, provider) && error40 instanceof APIConnectionTimeoutError && error40.message === "Ollama stream timed out";
@@ -716232,6 +716959,7 @@ var init_ur2 = __esm(() => {
   init_utils3();
   init_vcr();
   init_client2();
+  init_ollama();
   init_errors6();
   init_logging();
   init_promptCacheBreakDetection();
@@ -716275,7 +717003,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText2 = extractFirstUserMessageText(messages);
-  const fingerprint2 = computeFingerprint(messageText2, "1.65.10");
+  const fingerprint2 = computeFingerprint(messageText2, "1.65.12");
   const attributionHeader = getAttributionHeader(fingerprint2);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -721062,7 +721790,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.10",
+    ur_version: "1.65.12",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent2) => agent2.agentType),
     skills: inputs.skills.filter((s) => s.userInvocable !== false).map((skill2) => skill2.name),
@@ -722243,6 +722971,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);
@@ -722350,7 +723101,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, {
@@ -722472,6 +723223,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);
 });
@@ -722772,20 +723524,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;
@@ -722794,7 +723560,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;
@@ -722804,18 +723570,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);
     }
   }, {
@@ -722832,10 +723598,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);
   }, []);
@@ -722889,7 +723662,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");
@@ -722899,6 +723672,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") {
@@ -722907,12 +723685,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 {
@@ -722951,13 +723730,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, {
@@ -722967,19 +723782,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: [
                             " ",
@@ -722987,9 +723802,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,
@@ -723007,14 +723822,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,
@@ -723027,7 +723842,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)
@@ -723086,7 +723901,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),
@@ -723107,7 +723923,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();
@@ -723120,6 +723936,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);
@@ -723153,6 +723970,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;
@@ -723216,7 +724034,7 @@ function QuestionView({
       }
     };
     const placeholder = question.multiSelect ? "Type something" : "Type something.";
-    const textInputValue = questionStates[question.question]?.textInputValue ?? "";
+    const textInputValue = questionState?.textInputValue ?? "";
     return [
       ...textOptions,
       {
@@ -723231,7 +724049,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, {
@@ -723294,10 +724112,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);
               },
@@ -723312,10 +724130,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,
@@ -723419,6 +724237,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);
 });
@@ -723590,8 +724409,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,
@@ -723648,12 +724467,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 {
@@ -723668,26 +724488,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 {
@@ -723705,8 +724520,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" });
   }, []);
@@ -723744,18 +724567,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) {
@@ -723818,7 +724645,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 {
@@ -723827,7 +724654,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;
@@ -723842,22 +724669,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]);
@@ -723875,7 +724699,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) {
@@ -723892,7 +724716,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}`;
@@ -723922,7 +724746,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}`;
@@ -723958,10 +724782,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()) {
@@ -723982,21 +724809,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;
     }
@@ -724030,7 +724847,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,
@@ -724113,6 +724930,7 @@ var init_AskUserQuestionPermissionRequest = __esm(() => {
   init_planModeV2();
   init_plans();
   init_PermissionDialog();
+  init_prototypeSafeRecord();
   init_QuestionView();
   init_SubmitQuestionsView();
   init_use_multiple_choice_state();
@@ -734923,7 +735741,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.10") {
+function useUpdateNotification(updatedVersion, initialVersion = "1.65.12") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react222.useState(() => getSemverPart(initialVersion));
   if (!updatedVersion) {
     return null;
@@ -734972,7 +735790,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "1.65.10";
+    const currentVersion = "1.65.12";
     const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel);
     const isDisabled = isAutoUpdaterDisabled();
@@ -735201,12 +736019,12 @@ function NativeAutoUpdater({
     logEvent("tengu_native_auto_updater_start", {});
     try {
       const maxVersion = await getMaxVersion();
-      if (maxVersion && gt("1.65.10", maxVersion)) {
+      if (maxVersion && gt("1.65.12", maxVersion)) {
         const msg = await getMaxVersionMessage();
         setMaxVersionIssue(msg ?? "affects your version");
       }
       const result = await installLatest(channel);
-      const currentVersion = "1.65.10";
+      const currentVersion = "1.65.12";
       const latencyMs = Date.now() - startTime;
       if (result.lockFailed) {
         logEvent("tengu_native_auto_updater_lock_contention", {
@@ -735343,17 +736161,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.10", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.65.10"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("1.65.12", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.65.12"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("1.65.10", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("1.65.12", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.65.10"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.65.12"} -> ${latest}`);
       }
     };
     $2[0] = t1;
@@ -735387,7 +736205,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "1.65.10"
+        "1.65.12"
       ]
     }, undefined, true, undefined, this);
     $2[3] = verbose;
@@ -746107,7 +746925,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "1.65.10",
+    version: "1.65.12",
     output_style: {
       name: outputStyleName
     },
@@ -746185,7 +747003,7 @@ function StatusLineInner({
   const taskValues = Object.values(tasks2);
   const taskRunningCount = countActiveBackgroundTasks(taskValues);
   const defaultStatusLineText = buildDefaultStatusBar({
-    version: "1.65.10",
+    version: "1.65.12",
     providerLabel: providerRuntime.providerLabel,
     authMode: providerRuntime.authLabel,
     model: renderModelName(mainLoopModel) || providerRuntime.model || "",
@@ -747208,7 +748026,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);
@@ -747272,13 +748090,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,
@@ -756719,7 +757537,7 @@ __export(exports_asciicast, {
   _resetRecordingStateForTesting: () => _resetRecordingStateForTesting
 });
 import { appendFile as appendFile7, rename as rename11 } from "fs/promises";
-import { basename as basename66, dirname as dirname86, join as join238 } from "path";
+import { basename as basename66, dirname as dirname87, join as join238 } from "path";
 function getRecordFilePath() {
   if (recordingState.filePath !== null) {
     return recordingState.filePath;
@@ -756801,7 +757619,7 @@ function installAsciicastRecorder() {
     }
   });
   try {
-    getFsImplementation().mkdirSync(dirname86(filePath));
+    getFsImplementation().mkdirSync(dirname87(filePath));
   } catch {}
   getFsImplementation().appendFileSync(filePath, header + `
 `, { mode: 384 });
@@ -756870,7 +757688,7 @@ var init_asciicast = __esm(() => {
 });
 
 // src/utils/sessionRestore.ts
-import { dirname as dirname87 } from "path";
+import { dirname as dirname88 } from "path";
 function extractTodosFromTranscript(messages) {
   for (let i3 = messages.length - 1;i3 >= 0; i3--) {
     const msg = messages[i3];
@@ -756995,7 +757813,7 @@ async function processResumedConversation(result, opts, context6) {
   if (!opts.forkSession) {
     const sid = opts.sessionIdOverride ?? result.sessionId;
     if (sid) {
-      switchSession(asSessionId(sid), opts.transcriptPath ? dirname87(opts.transcriptPath) : null);
+      switchSession(asSessionId(sid), opts.transcriptPath ? dirname88(opts.transcriptPath) : null);
       await renameRecordingForSession();
       await resetSessionFilePointer();
       restoreCostStateForSession(sid);
@@ -758365,7 +759183,7 @@ async function submitTranscriptShare(messages, trigger2, appearanceId) {
     } catch {}
     const data = {
       trigger: trigger2,
-      version: "1.65.10",
+      version: "1.65.12",
       platform: process.platform,
       transcript,
       subagentTranscripts: Object.keys(subagentTranscripts).length > 0 ? subagentTranscripts : undefined,
@@ -766095,7 +766913,7 @@ var exports_REPL = {};
 __export(exports_REPL, {
   REPL: () => REPL
 });
-import { dirname as dirname88, join as join241 } from "path";
+import { dirname as dirname89, join as join241 } from "path";
 import { tmpdir as tmpdir20 } from "os";
 import { writeFile as writeFile47 } from "fs/promises";
 import { randomUUID as randomUUID83 } from "crypto";
@@ -767035,7 +767853,7 @@ function REPL({
       const targetSessionCosts = getStoredSessionCosts(sessionId);
       saveCurrentSessionCosts();
       resetCostState();
-      switchSession(asSessionId(sessionId), log2.fullPath ? dirname88(log2.fullPath) : null);
+      switchSession(asSessionId(sessionId), log2.fullPath ? dirname89(log2.fullPath) : null);
       const {
         renameRecordingForSession: renameRecordingForSession2
       } = await Promise.resolve().then(() => (init_asciicast(), exports_asciicast));
@@ -770730,7 +771548,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "1.65.10"
+              "1.65.12"
             ]
           }, undefined, true, undefined, this)
         ]
@@ -771990,7 +772808,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "1.65.10"
+    lastOnboardingVersion: "1.65.12"
   }));
 }
 function showDialog(root2, renderer) {
@@ -773134,7 +773952,7 @@ var exports_ResumeConversation = {};
 __export(exports_ResumeConversation, {
   ResumeConversation: () => ResumeConversation
 });
-import { dirname as dirname89 } from "path";
+import { dirname as dirname90 } from "path";
 function parsePrIdentifier(value2) {
   const directNumber = parseInt(value2, 10);
   if (!isNaN(directNumber) && directNumber > 0) {
@@ -773266,7 +774084,7 @@ function ResumeConversation({
       }
       if (false) {}
       if (result_3.sessionId && !forkSession) {
-        switchSession(asSessionId(result_3.sessionId), log_0.fullPath ? dirname89(log_0.fullPath) : null);
+        switchSession(asSessionId(result_3.sessionId), log_0.fullPath ? dirname90(log_0.fullPath) : null);
         await renameRecordingForSession();
         await resetSessionFilePointer();
         restoreCostStateForSession(result_3.sessionId);
@@ -776985,7 +777803,7 @@ var init_createDirectConnectSession = __esm(() => {
 });
 
 // src/utils/errorLogSink.ts
-import { dirname as dirname90, join as join242 } from "path";
+import { dirname as dirname91, join as join242 } from "path";
 function getErrorsPath() {
   return join242(CACHE_PATHS.errors(), DATE + ".jsonl");
 }
@@ -777006,7 +777824,7 @@ function createJsonlWriter(options4) {
 function getLogWriter(path24) {
   let writer = logWriters.get(path24);
   if (!writer) {
-    const dir = dirname90(path24);
+    const dir = dirname91(path24);
     writer = createJsonlWriter({
       writeFn: (content) => {
         try {
@@ -777034,7 +777852,7 @@ function appendToLog(path24, message) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "1.65.10"
+    version: "1.65.12"
   };
   getLogWriter(path24).write(messageWithTimestamp);
 }
@@ -781198,8 +782016,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("1.65.10", cfg.min_version)) {
-    return `Your version of UR (${"1.65.10"}) is too old for Remote Control.
+  if (cfg.min_version && lt("1.65.12", cfg.min_version)) {
+    return `Your version of UR (${"1.65.12"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`ur update\` to update.`;
   }
   return null;
@@ -781527,14 +782345,14 @@ __export(exports_bridgePointer, {
   BRIDGE_POINTER_TTL_MS: () => BRIDGE_POINTER_TTL_MS
 });
 import { mkdir as mkdir47, readFile as readFile57, stat as stat51, unlink as unlink27, writeFile as writeFile50 } from "fs/promises";
-import { dirname as dirname91, join as join247 } from "path";
+import { dirname as dirname92, join as join247 } from "path";
 function getBridgePointerPath(dir) {
   return join247(getProjectsDir(), sanitizePath2(dir), "bridge-pointer.json");
 }
 async function writeBridgePointer(dir, pointer) {
   const path24 = getBridgePointerPath(dir);
   try {
-    await mkdir47(dirname91(path24), { recursive: true });
+    await mkdir47(dirname92(path24), { recursive: true });
     await writeFile50(path24, jsonStringify(pointer), "utf8");
     logForDebugging(`[bridge:pointer] wrote ${path24}`);
   } catch (err2) {
@@ -781673,7 +782491,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "1.65.10",
+    runnerVersion: "1.65.12",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -783538,7 +784356,7 @@ __export(exports_print, {
   canBatchWith: () => canBatchWith
 });
 import { readFile as readFile58, stat as stat52, writeFile as writeFile51 } from "fs/promises";
-import { dirname as dirname92 } from "path";
+import { dirname as dirname93 } from "path";
 import { cwd as cwd2 } from "process";
 import { randomUUID as randomUUID89 } from "crypto";
 function trackReceivedMessageUuid(uuid3) {
@@ -785995,7 +786813,7 @@ async function loadInitialMessages(setAppState, options4) {
         if (false) {}
         if (!options4.forkSession) {
           if (result.sessionId) {
-            switchSession(asSessionId(result.sessionId), result.fullPath ? dirname92(result.fullPath) : null);
+            switchSession(asSessionId(result.sessionId), result.fullPath ? dirname93(result.fullPath) : null);
             if (persistSession) {
               await resetSessionFilePointer();
             }
@@ -786093,7 +786911,7 @@ async function loadInitialMessages(setAppState, options4) {
       }
       if (false) {}
       if (!options4.forkSession && result.sessionId) {
-        switchSession(asSessionId(result.sessionId), result.fullPath ? dirname92(result.fullPath) : null);
+        switchSession(asSessionId(result.sessionId), result.fullPath ? dirname93(result.fullPath) : null);
         if (persistSession) {
           await resetSessionFilePointer();
         }
@@ -791146,7 +791964,7 @@ function getAgUiCapabilities() {
       name: "UR-Nexus",
       type: "ur-nexus",
       description: "Provider-flexible, local-first autonomous engineering workflow agent.",
-      version: "1.65.10",
+      version: "1.65.12",
       provider: "UR",
       documentationUrl: "https://github.com/Maitham16/UR/blob/master/docs/AG_UI.md"
     },
@@ -792286,7 +793104,7 @@ function createMCPServer(cwd4, debug2, verbose) {
   };
   const server2 = new Server({
     name: "ur-nexus",
-    version: "1.65.10"
+    version: "1.65.12"
   }, {
     capabilities: {
       tools: {}
@@ -793444,7 +794262,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.10" }, { capabilities: {} });
+  const client2 = new Client({ name: "ur-mcp-2026-adapter", version: "1.65.12" }, { capabilities: {} });
   const [clientTransport, serverTransport] = createLinkedTransportPair();
   try {
     await server2.connect(serverTransport);
@@ -793455,7 +794273,7 @@ async function createUrMcp2026Runtime(options4) {
   }
   const runtime2 = new Mcp2026Runtime({
     cwd: options4.cwd,
-    version: "1.65.10",
+    version: "1.65.12",
     backend: {
       listTools: async () => {
         const listed = await client2.listTools();
@@ -794418,7 +795236,7 @@ __export(exports_plugins, {
   VALID_UPDATE_SCOPES: () => VALID_UPDATE_SCOPES,
   VALID_INSTALLABLE_SCOPES: () => VALID_INSTALLABLE_SCOPES
 });
-import { basename as basename69, dirname as dirname94, join as join251, resolve as resolve76 } from "path";
+import { basename as basename69, dirname as dirname95, join as join251, resolve as resolve76 } from "path";
 function handleMarketplaceError(error40, action3) {
   logError2(error40);
   cliError(`${figures_default.cross} Failed to ${action3}: ${errorMessage2(error40)}`);
@@ -794471,9 +795289,9 @@ async function pluginValidateHandler(manifestPath6, options4) {
     printValidationResult(result);
     let contentResults = [];
     if (result.fileType === "plugin") {
-      const manifestDir = dirname94(result.filePath);
+      const manifestDir = dirname95(result.filePath);
       if (basename69(manifestDir) === ".ur-plugin") {
-        contentResults = await validatePluginContents(dirname94(manifestDir));
+        contentResults = await validatePluginContents(dirname95(manifestDir));
         for (const r of contentResults) {
           console.log(`Validating ${r.fileType}: ${r.filePath}
 `);
@@ -795588,7 +796406,7 @@ async function update() {
   logEvent("tengu_update_check", {});
   const diagnostic2 = await getDoctorDiagnostic();
   const result = await checkUpgradeStatus({
-    currentVersion: "1.65.10",
+    currentVersion: "1.65.12",
     packageName: UR_AGENT_PACKAGE_NAME,
     installationType: diagnostic2.installationType,
     latestVersion: () => getLatestNpmPackageVersion(UR_AGENT_PACKAGE_NAME)
@@ -796904,7 +797722,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "1.65.10",
+      version: "1.65.12",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -797690,7 +798508,7 @@ Usage: ur --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("1.65.10 (UR-Nexus)", "-v, --version", "Output the version number");
+  }).version("1.65.12 (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()) {
@@ -798749,7 +799567,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.10"} (UR-Nexus)`);
+    console.log(`${"1.65.12"} (UR-Nexus)`);
     return;
   }
   if (args[0] === "a2a" && args[1] === "serve" && !args.includes("--help") && !args.includes("-h")) {