@quantiya/codevibe-antigravity-plugin 2.0.102 → 2.0.104

package/dist/agy-hook.js

@@ -100,8 +100,32 @@ function decodeBoolean(val) {
   if (typeof val === "number") return val !== 0;
   return false;
 }
+function sliceToSerializedBudget(rawText, buildCandidate, maxChars) {
+  if (maxChars <= 0) return null;
+  const emptyCandidate = buildCandidate("");
+  if (emptyCandidate.length > maxChars) {
+    return "[]".length <= maxChars ? "[]" : null;
+  }
+  const fullCandidate = buildCandidate(rawText);
+  if (fullCandidate.length <= maxChars) return fullCandidate;
+  let low = 0;
+  let high = rawText.length;
+  let best = emptyCandidate;
+  while (low <= high) {
+    const mid = low + high >>> 1;
+    const candidate = buildCandidate(rawText.slice(0, mid));
+    if (candidate.length <= maxChars) {
+      best = candidate;
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+  return best;
+}
 function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyHint) {
   try {
+    if (maxChars <= 0) return null;
     let parsed = value;
     if (typeof value === "string") {
       const trimmed = value.trim();
@@ -120,57 +144,72 @@ function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyH
         (item) => typeof item === "string" || typeof item === "number" || item && typeof item === "object" && !("question" in item)
       );
       if (isOptionArray) {
+        const wasSlicedAtCap = parsed.length > 30;
         const boundedOptions = parsed.slice(0, 30).map((opt, idx) => {
-          if (typeof opt === "string") return { number: String(idx + 1), text: opt.slice(0, 256) };
+          if (typeof opt === "string") return { number: String(idx + 1), text: opt };
           if (typeof opt === "number") return { number: String(idx + 1), text: String(opt) };
           if (opt && typeof opt === "object") {
             const optObj = opt;
             const num = typeof optObj.number !== "undefined" ? String(optObj.number).slice(0, 16) : String(idx + 1);
-            const txt = typeof optObj.text === "string" ? optObj.text.slice(0, 256) : String(optObj.text ?? optObj.label ?? optObj.value ?? "").slice(0, 256);
+            const txt = typeof optObj.text === "string" ? optObj.text : String(optObj.text ?? optObj.label ?? optObj.value ?? "");
             return { number: num, text: txt };
           }
-          return { number: String(idx + 1), text: String(opt ?? "").slice(0, 256) };
+          return { number: String(idx + 1), text: String(opt ?? "") };
         });
+        if (wasSlicedAtCap && boundedOptions.length > 0) {
+          boundedOptions[0].options_truncated = true;
+        }
         const str2 = JSON.stringify(boundedOptions);
         if (str2.length <= maxChars) return str2;
         for (let i = boundedOptions.length - 1; i >= 1; i--) {
-          const sub = JSON.stringify(boundedOptions.slice(0, i));
+          const prefix = boundedOptions.slice(0, i).map(
+            (o, idx) => idx === 0 ? { ...o, options_truncated: true } : o
+          );
+          const sub = JSON.stringify(prefix);
           if (sub.length <= maxChars) return sub;
         }
         const firstOpt = boundedOptions[0];
         if (firstOpt) {
-          const safeText = firstOpt.text.slice(0, Math.max(0, maxChars - 30));
-          return JSON.stringify([{ number: firstOpt.number, text: safeText }]);
+          return sliceToSerializedBudget(
+            firstOpt.text,
+            (safeText) => JSON.stringify([{ number: firstOpt.number, text: safeText, options_truncated: true }]),
+            maxChars
+          );
         }
-        return JSON.stringify(boundedOptions.slice(0, 1));
+        return "[]".length <= maxChars ? "[]" : null;
       }
       const bounded = parsed.slice(0, 20).map((item) => {
-        if (typeof item === "string") return { question: item.slice(0, 1024), options: [] };
+        if (typeof item === "string") return { question: item, options: [] };
         if (item && typeof item === "object") {
           const res = {};
           const obj = item;
-          if (typeof obj.question === "string") res.question = obj.question.slice(0, 1024);
+          if (typeof obj.question === "string") res.question = obj.question;
           if (typeof obj.is_multi_select !== "undefined") res.is_multi_select = decodeBoolean(obj.is_multi_select);
           if (typeof obj.isMultiSelect !== "undefined") res.isMultiSelect = decodeBoolean(obj.isMultiSelect);
+          if (typeof obj.options_truncated !== "undefined") res.options_truncated = decodeBoolean(obj.options_truncated);
+          if (typeof obj.optionsTruncated !== "undefined") res.optionsTruncated = decodeBoolean(obj.optionsTruncated);
           if (Array.isArray(obj.options)) {
-            res.options = obj.options.slice(0, 25).map((opt, idx) => {
-              if (typeof opt === "string") return opt.slice(0, 256);
+            if (obj.options.length > 25) {
+              res.options_truncated = true;
+            }
+            res.options = obj.options.slice(0, 25).map((opt) => {
+              if (typeof opt === "string") return opt;
               if (typeof opt === "number") return String(opt);
               if (opt && typeof opt === "object") {
                 const optObj = opt;
                 return {
                   ...typeof optObj.number !== "undefined" ? { number: String(optObj.number).slice(0, 16) } : {},
-                  text: typeof optObj.text === "string" ? optObj.text.slice(0, 256) : String(optObj.text ?? optObj.label ?? optObj.value ?? "").slice(0, 256)
+                  text: typeof optObj.text === "string" ? optObj.text : String(optObj.text ?? optObj.label ?? optObj.value ?? "")
                 };
               }
-              return String(opt ?? "").slice(0, 256);
+              return String(opt ?? "");
             });
           }
           return res;
         }
-        return { question: String(item).slice(0, 1024), options: [] };
+        return { question: String(item), options: [] };
       });
-      let str = JSON.stringify(bounded);
+      const str = JSON.stringify(bounded);
       if (str.length <= maxChars) return str;
       for (let i = bounded.length - 1; i >= 1; i--) {
         const sub = JSON.stringify(bounded.slice(0, i));
@@ -178,11 +217,26 @@ function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyH
       }
       const firstQ = bounded[0];
       if (firstQ && typeof firstQ === "object") {
-        const qText = typeof firstQ.question === "string" ? firstQ.question : "";
-        const safeQText = qText.slice(0, Math.max(0, maxChars - 30));
-        return JSON.stringify([{ question: safeQText, options: [] }]);
+        const qObj = firstQ;
+        const qText = typeof qObj.question === "string" ? qObj.question : "";
+        const opts = Array.isArray(qObj.options) ? qObj.options : [];
+        for (let k = opts.length - 1; k >= 1; k--) {
+          const subQ = JSON.stringify([{ ...qObj, options: opts.slice(0, k), options_truncated: true }]);
+          if (subQ.length <= maxChars) return subQ;
+        }
+        return sliceToSerializedBudget(
+          qText,
+          (safeQText) => JSON.stringify([
+            {
+              question: safeQText,
+              options: [],
+              ...opts.length > 0 ? { options_truncated: true } : {}
+            }
+          ]),
+          maxChars
+        );
       }
-      return JSON.stringify(bounded.slice(0, 1));
+      return "[]".length <= maxChars ? "[]" : null;
     }
     if (parsed && typeof parsed === "object") {
       const raw = JSON.stringify(parsed);
@@ -216,6 +270,8 @@ function buildBody(raw) {
           if (key === "questions" || key === "options") {
             const serialized = serializeStructuredArg(value, MAX_STRUCTURED_ARG_CHARS, key);
             if (serialized !== null) kept[key] = serialized;
+          } else if (key === "question" || key === "prompt") {
+            kept[key] = value.slice(0, MAX_STRUCTURED_ARG_CHARS);
           } else {
             kept[key] = value.slice(0, MAX_TOOL_ARG_CHARS);
           }

package/dist/server.js

@@ -3556,8 +3556,9 @@ function looksLikePromptSnapshot(snapshot) {
       const allLines = stripped.trimEnd().split("\n");
       const fenceMask = computeFenceMask(allLines);
       const windowStart = Math.max(0, allLines.length - 30);
+      const questionWindowStart = Math.max(0, allLines.length - 80);
       let headerIdx = -1;
-      for (let i = allLines.length - 1; i >= windowStart; i--) {
+      for (let i = allLines.length - 1; i >= questionWindowStart; i--) {
         if (!fenceMask[i] && isQuestionHeaderLine(allLines[i])) {
           headerIdx = i;
           break;
@@ -3565,9 +3566,16 @@ function looksLikePromptSnapshot(snapshot) {
       }
       if (headerIdx < 0) return false;
       const headerLine = allLines[headerIdx].trim();
+      const isTallHeader = headerIdx < windowStart;
       const optionIndices = [];
       for (let i = headerIdx + 1; i < allLines.length; i++) {
-        if (!fenceMask[i] && /^[>\s❯]*[1-9][.)]\s+\S/.test(allLines[i].trim())) {
+        if (fenceMask[i]) continue;
+        const trimmed = allLines[i].trim();
+        if (!trimmed) continue;
+        if ((isTallHeader || optionIndices.length > 0) && isResumedTurnSignal(trimmed) || isComposerBoxAt(allLines, i) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+          return false;
+        }
+        if (/^(?:[>\s❯]{0,4})[1-9][.)]\s+\S/.test(allLines[i])) {
           optionIndices.push(i);
         }
       }
@@ -3591,7 +3599,7 @@ function looksLikePromptSnapshot(snapshot) {
           }
         }
       }
-      if (!hasQuestionFooter) return false;
+      if (!hasQuestionFooter || footerIdx < windowStart) return false;
       if (hasTrailingAgyComposer(allLines, footerIdx, fenceMask)) {
         return false;
       }
@@ -4310,6 +4318,38 @@ function detectActivePromptKind(snapshot) {
     }
     if (lastApprovalLineIdx >= 0 && lastQuestionLineIdx >= 0 && lastFileAccessLineIdx >= 0 && lastSystemErrorLineIdx >= 0) break;
   }
+  if (lastQuestionLineIdx < 0 && lastApprovalLineIdx < 0 && lastFileAccessLineIdx < 0) {
+    const tallQuestionStart = Math.max(0, lines.length - 80);
+    for (let i = windowStart - 1; i >= tallQuestionStart; i--) {
+      if (lineInFence[i]) continue;
+      if (isQuestionHeaderLine(lines[i])) {
+        let optCount = 0;
+        let footerInBottomWindow = false;
+        let footerIdx = i;
+        let interrupted = false;
+        for (let j = i + 1; j < lines.length; j++) {
+          if (lineInFence[j]) continue;
+          const trimmed = lines[j].trim();
+          if (!trimmed) continue;
+          if (approvalRe.test(trimmed) || fileEditQuestionRe.test(trimmed) || fileAccessRe.test(trimmed) || fileAccessQuestionRe.test(trimmed) || /Do you want to proceed\?/i.test(trimmed) || isResumedTurnSignal(trimmed) || isComposerBoxAt(lines, j) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+            interrupted = true;
+            break;
+          }
+          if (/^(?:[>\s❯]{0,4})[1-9][.)]\s+\S/.test(lines[j])) {
+            optCount += 1;
+          } else if (isQuestionFooterLine(trimmed) && j >= windowStart) {
+            footerInBottomWindow = true;
+            footerIdx = j;
+            break;
+          }
+        }
+        if (!interrupted && optCount >= 2 && footerInBottomWindow && !hasTrailingAgyComposer(lines, footerIdx, lineInFence)) {
+          lastQuestionLineIdx = i;
+        }
+        break;
+      }
+    }
+  }
   if (lastApprovalLineIdx < 0 && lastQuestionLineIdx < 0) {
     for (let i = lines.length - 1; i >= windowStart; i--) {
       if (/Do you want to proceed\?/i.test(lines[i])) {
@@ -4335,7 +4375,7 @@ function detectActivePromptKind(snapshot) {
         for (let j = lastSystemErrorLineIdx + 1; j < lines.length; j++) {
           if (!lineInFence[j]) {
             const trimmed = lines[j].trim();
-            if (hasQuestionOptions && isResumedTurnSignal(trimmed)) {
+            if ((hasQuestionOptions || lastQuestionLineIdx < windowStart) && isResumedTurnSignal(trimmed)) {
               break;
             }
             if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
@@ -4389,7 +4429,7 @@ function detectActivePromptKind(snapshot) {
         if (isAgyStatusFooterLine(trimmed) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(trimmed) || isComposerBoxAt(lines, j)) {
           break;
         }
-        if (hasFoundOptions && isResumedTurnSignal(trimmed)) {
+        if ((hasFoundOptions || lastQuestionLineIdx < windowStart) && isResumedTurnSignal(trimmed)) {
           break;
         }
         if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
@@ -4882,7 +4922,8 @@ function buildApprovalSemanticKey(candidate) {
     body: isDiffBody ? rawBody.trim() : normalize(rawBody),
     options: (candidate.options ?? []).map((option) => ({
       number: option.number,
-      text: normalize(option.text)
+      text: normalize(option.text),
+      ...option.rawLines && option.rawLines.length > 1 ? { rawLines: option.rawLines.map((line) => normalize(line)) } : {}
     })),
     submitMap: Object.fromEntries(
       Object.entries(candidate.submitMap ?? {}).sort(([left], [right]) => Number(left) - Number(right)).map(([number, keys]) => [number, [...keys]])
@@ -5003,7 +5044,7 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
     }
   }
   const belowHeader = headerIdx >= 0 ? lines.slice(headerIdx + 1).join("\n") : stripped;
-  const options = parseOptions(belowHeader);
+  const options = parseOptions(belowHeader, 80);
   if (options.length < 2) return null;
   const normalizedHeader = header.fullLine.replace(/^[❯>\s*•-]+\s*/, "").trim();
   const isMultiSelect = /\bselect\s+(?:all|multiple)\b/i.test(normalizedHeader) || /\bselect\s+(?:all|multiple)\b/i.test(belowHeader) || /(?:<space>|\bspace)\s+(?:to\s+)?(?:select|toggle)\b/i.test(belowHeader) || /\bctrl\+a\s+select\s+all\b/i.test(belowHeader);
@@ -5024,7 +5065,7 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
 }
 function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   const lines = belowHeader.split("\n");
-  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
+  const optionRegex = /^(?:[>\s❯]{0,4})([1-9])[.)]\s+(.+?)\s*$/;
   const lineInFence = computeFenceMask(lines);
   let firstOptionIdx = -1;
   for (let i = 0; i < lines.length; i++) {
@@ -5037,7 +5078,34 @@ function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   if (firstOptionIdx <= 0) return "";
   return lines.slice(0, firstOptionIdx).join("\n").trim();
 }
-function parseOptions(snapshot) {
+function isOptionContinuationBoundary(trimmed, rawLine, nextTrimmedLine) {
+  if (!trimmed) return true;
+  if (/^[•‣◦▪▫]\s/.test(trimmed)) return true;
+  if (/^\s{2,4}[-*]\s/.test(rawLine)) return true;
+  if (isQuestionFooterLine(trimmed)) return true;
+  if (isQuestionHeaderLine(trimmed)) return true;
+  if (isResumedTurnSignal(trimmed)) return true;
+  if (/^[─━═-]{4,}$/.test(trimmed)) return true;
+  if (/^\s*esc to cancel\b/i.test(trimmed)) return true;
+  if (/^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate\b/i.test(trimmed)) return true;
+  if (/^ctrl\+[a-z0-9]+\s+[a-zA-Z]+$/i.test(trimmed)) return true;
+  if (/^\(?use\s+(?:arrow|\S+)\s+keys[^)]*\)?$/i.test(trimmed)) return true;
+  if (!/^ {5,}/.test(rawLine) && /^Your answer:/i.test(trimmed) && (/^Your answer:\s*$/i.test(trimmed) || Boolean(
+    nextTrimmedLine && (isQuestionFooterLine(nextTrimmedLine) || /^\(?Enter to submit(?:\s*,\s*esc to cancel)?\)?\s*$/i.test(nextTrimmedLine) || /^\s*esc to cancel\b/i.test(nextTrimmedLine))
+  ))) {
+    return true;
+  }
+  if (!/^ {5,}/.test(rawLine) && /^\(?Enter to submit(?:\s*,\s*esc to cancel)?\)?\s*$/i.test(trimmed)) {
+    return true;
+  }
+  if (/^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) return true;
+  if (/Requesting permission for:/i.test(trimmed)) return true;
+  if (/Do you want to proceed\?/i.test(trimmed)) return true;
+  if (/^\s*Allow access to this file\?\s*$/i.test(trimmed)) return true;
+  if (/^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i.test(trimmed)) return true;
+  return false;
+}
+function parseOptions(snapshot, maxRecentLines = 30) {
   const lines = snapshot.split("\n");
   const lineInFence = computeFenceMask(lines);
   const filteredLines = [];
@@ -5049,16 +5117,72 @@ function parseOptions(snapshot) {
   while (filteredLines.length > 0 && filteredLines[filteredLines.length - 1].trim() === "") {
     filteredLines.pop();
   }
-  const recent = filteredLines.slice(-30);
-  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
+  const recent = filteredLines.slice(-Math.max(30, maxRecentLines));
+  const optionRegex = /^(?:[>\s❯]{0,4})([1-9])[.)]\s+(.+?)\s*$/;
   const found = /* @__PURE__ */ new Map();
-  for (const line of recent) {
+  let currentOptionNum = null;
+  let currentOptionTextCol = 5;
+  let prevOptionRawLen = 0;
+  for (let idx = 0; idx < recent.length; idx++) {
+    const line = recent[idx];
     const m = line.match(optionRegex);
-    if (!m) continue;
-    const num = m[1];
-    found.set(num, m[2].trim());
+    if (m) {
+      const num = m[1];
+      const text = m[2].trim();
+      const prefixMatch = line.match(/^(?:[>\s❯]{0,4})[1-9][.)]\s+/);
+      currentOptionTextCol = prefixMatch ? prefixMatch[0].length : 5;
+      prevOptionRawLen = line.trimEnd().length;
+      found.set(num, {
+        text,
+        rawLines: [text],
+        rawLineLengths: [prevOptionRawLen]
+      });
+      currentOptionNum = /^\s*write-?in(?:\s*(?:\.{3}|…))?\s*$/i.test(text) ? null : num;
+      continue;
+    }
+    const trimmed = line.trim();
+    if (currentOptionNum !== null) {
+      let nextTrimmedLine;
+      for (let k = idx + 1; k < recent.length; k++) {
+        const nt = recent[k].trim();
+        if (nt) {
+          nextTrimmedLine = nt;
+          break;
+        }
+      }
+      const leadingSpaces = (line.match(/^\s*/)?.[0] ?? "").length;
+      const isIndentedContinuation = leadingSpaces >= Math.max(4, currentOptionTextCol);
+      const isColumnZeroWrapContinuation = leadingSpaces === 0;
+      if (isOptionContinuationBoundary(trimmed, line, nextTrimmedLine) || !isIndentedContinuation && !isColumnZeroWrapContinuation) {
+        currentOptionNum = null;
+      } else {
+        const entry = found.get(currentOptionNum);
+        if (entry) {
+          const existing = entry.text;
+          entry.text = existing ? `${existing} ${trimmed}` : trimmed;
+          entry.rawLines.push(trimmed);
+          prevOptionRawLen = line.trimEnd().length;
+          entry.rawLineLengths.push(prevOptionRawLen);
+        }
+      }
+    }
   }
-  return Array.from(found.entries()).sort(([a], [b]) => Number(a) - Number(b)).map(([number, text]) => ({ number, text }));
+  return Array.from(found.entries()).sort(([a], [b]) => Number(a) - Number(b)).map(([number, entry]) => {
+    const opt = { number, text: entry.text };
+    if (entry.rawLines.length > 1) {
+      Object.defineProperty(opt, "rawLines", {
+        value: entry.rawLines,
+        enumerable: false,
+        configurable: true
+      });
+      Object.defineProperty(opt, "rawLineLengths", {
+        value: entry.rawLineLengths,
+        enumerable: false,
+        configurable: true
+      });
+    }
+    return opt;
+  });
 }
 function buildApprovalSubmitMap(options) {
   const map = {};
@@ -5079,10 +5203,11 @@ function isWriteInInputActive(paneText, expectedHeader, expectedStep, expectedBo
   if (detectActivePromptKind(paneText) !== "question") return false;
   const stripped = stripAnsiAndExpandRep(paneText);
   const lines = stripped.trimEnd().split("\n");
-  const windowStart = Math.max(0, lines.length - 30);
+  const fenceMask = computeFenceMask(lines);
+  const windowStart = Math.max(0, lines.length - 80);
   let headerIdx = -1;
   for (let i = lines.length - 1; i >= windowStart; i--) {
-    if (isQuestionHeaderLine(lines[i])) {
+    if (!fenceMask[i] && isQuestionHeaderLine(lines[i])) {
       headerIdx = i;
       break;
     }
@@ -5586,28 +5711,61 @@ function extractAllQuestionsFromArgs(toolName, args) {
         const qObj = qItem;
         const qText = typeof qObj.question === "string" ? stripWrappingQuotes2(qObj.question.trim()) : "Question";
         const opts = [];
+        let optItemTruncated = false;
         if (Array.isArray(qObj.options)) {
           for (let i = 0; i < qObj.options.length; i++) {
             const opt = qObj.options[i];
             if (typeof opt === "string" && opt.trim().length > 0) {
               opts.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
             } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
+              const optRecord = opt;
+              if (decodeBoolean(optRecord.options_truncated ?? optRecord.optionsTruncated)) {
+                optItemTruncated = true;
+              }
               opts.push({
-                number: String(opt.number ?? i + 1),
-                text: stripWrappingQuotes2(String(opt.text).trim())
+                number: String(optRecord.number ?? i + 1),
+                text: stripWrappingQuotes2(String(optRecord.text).trim())
               });
             }
           }
         }
         const isMulti = decodeBoolean(qObj.is_multi_select ?? qObj.isMultiSelect);
-        items.push({ question: qText, options: opts, isMultiSelect: isMulti });
+        const isTruncated = optItemTruncated || decodeBoolean(qObj.options_truncated ?? qObj.optionsTruncated);
+        items.push({
+          question: qText,
+          options: opts,
+          isMultiSelect: isMulti,
+          ...isTruncated ? { optionsTruncated: true } : {}
+        });
       }
     }
   } else if (typeof a.question === "string" || typeof a.prompt === "string") {
     const qText = stripWrappingQuotes2(String(a.question ?? a.prompt).trim());
     const opts = extractQuestionOptionsFromArgs(toolName, args) ?? [];
     const isMulti = decodeBoolean(a.is_multi_select ?? a.isMultiSelect);
-    items.push({ question: qText, options: opts, isMultiSelect: isMulti });
+    let topOptTruncated = decodeBoolean(a.options_truncated ?? a.optionsTruncated);
+    if (!topOptTruncated && (Array.isArray(a.options) || typeof a.options === "string")) {
+      let topOptions = a.options;
+      if (typeof topOptions === "string") {
+        try {
+          topOptions = JSON.parse(topOptions.trim());
+        } catch {
+        }
+      }
+      if (Array.isArray(topOptions)) {
+        topOptTruncated = topOptions.some(
+          (o) => o !== null && typeof o === "object" && decodeBoolean(
+            o.options_truncated ?? o.optionsTruncated
+          )
+        );
+      }
+    }
+    items.push({
+      question: qText,
+      options: opts,
+      isMultiSelect: isMulti,
+      ...topOptTruncated ? { optionsTruncated: true } : {}
+    });
   }
   return items.length > 0 ? items : void 0;
 }
@@ -5709,6 +5867,104 @@ function matchPaneQuestionLines(hookText, candidate) {
 function paneCandidateMatchesQuestion(hookText, candidate) {
   return matchPaneQuestionLines(hookText, candidate) !== null;
 }
+function buildHookQuestionOptionsAndSubmitMap(rawOptions, isMultiSelect, optionsTruncated = false) {
+  if (!rawOptions || rawOptions.length === 0) {
+    return { paneOptions: void 0, submitMap: {} };
+  }
+  const normalized = rawOptions.map((opt, idx) => {
+    const entry = {
+      number: String(opt.number ?? idx + 1),
+      text: opt.text
+    };
+    if (opt.isGeneratedWriteIn) {
+      Object.defineProperty(entry, "isGeneratedWriteIn", {
+        value: true,
+        enumerable: false,
+        configurable: true
+      });
+    }
+    return entry;
+  });
+  if (isMultiSelect || optionsTruncated || normalized.length >= 9) {
+    return { paneOptions: normalized, submitMap: {} };
+  }
+  const lastOpt = normalized[normalized.length - 1];
+  const hasTrailingGeneratedWriteIn = Boolean(lastOpt?.isGeneratedWriteIn);
+  let paneOptions;
+  if (hasTrailingGeneratedWriteIn) {
+    paneOptions = normalized;
+  } else {
+    const writeInOpt = {
+      number: String(normalized.length + 1),
+      text: "Write-in..."
+    };
+    Object.defineProperty(writeInOpt, "isGeneratedWriteIn", {
+      value: true,
+      enumerable: false,
+      configurable: true
+    });
+    paneOptions = [...normalized, writeInOpt];
+  }
+  const submitMap = {};
+  for (const opt of paneOptions) {
+    submitMap[opt.number] = [opt.number];
+  }
+  return { paneOptions, submitMap };
+}
+function hookOptionsMatchPaneOptions(hookOpts, paneOpts) {
+  if (!hookOpts || hookOpts.length === 0 || !paneOpts || paneOpts.length === 0) {
+    return false;
+  }
+  const normOpt = (s) => s.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
+  const hookNormalized = hookOpts.map((o, idx) => ({
+    number: String(o.number ?? idx + 1).trim(),
+    text: normOpt(o.text),
+    isGeneratedWriteIn: Boolean(o.isGeneratedWriteIn)
+  }));
+  const hookEffective = hookNormalized.length > 0 && hookNormalized[hookNormalized.length - 1].isGeneratedWriteIn ? hookNormalized.slice(0, -1) : hookNormalized;
+  const paneNormalized = paneOpts.map((o, idx) => ({
+    number: String(o.number ?? idx + 1).trim(),
+    text: normOpt(o.text),
+    isGeneratedWriteIn: Boolean(o.isGeneratedWriteIn)
+  }));
+  const lastPane = paneNormalized[paneNormalized.length - 1];
+  const paneHasTrailingWriteIn = Boolean(lastPane) && (lastPane.isGeneratedWriteIn || paneNormalized.length === hookEffective.length + 1 && /^\s*write-?in(?:\.{3}|…)?\s*$/i.test(lastPane.text));
+  const paneEffective = paneHasTrailingWriteIn ? paneNormalized.slice(0, -1) : paneNormalized;
+  if (hookEffective.length === 0 || hookEffective.length !== paneEffective.length) {
+    return false;
+  }
+  return hookEffective.every(
+    (h, i) => paneEffective[i].text === h.text && paneEffective[i].number === h.number
+  );
+}
+function tagPaneGeneratedWriteInOption(paneOpts, hookStepOpts) {
+  if (!paneOpts || paneOpts.length === 0) return paneOpts;
+  const hookBaseOpts = hookStepOpts ? hookStepOpts.filter((o) => !o.isGeneratedWriteIn) : void 0;
+  for (let i = 0; i < paneOpts.length - 1; i++) {
+    const opt = paneOpts[i];
+    if (opt?.isGeneratedWriteIn) {
+      delete opt.isGeneratedWriteIn;
+    }
+  }
+  const lastOpt = paneOpts[paneOpts.length - 1];
+  if (!lastOpt || !/^\s*write-?in(?:\.{3}|…)?\s*$/i.test(lastOpt.text)) {
+    if (lastOpt?.isGeneratedWriteIn) {
+      delete lastOpt.isGeneratedWriteIn;
+    }
+    return paneOpts;
+  }
+  const isGenerated = !hookBaseOpts || hookBaseOpts.length === 0 || paneOpts.length === hookBaseOpts.length + 1;
+  if (isGenerated) {
+    Object.defineProperty(lastOpt, "isGeneratedWriteIn", {
+      value: true,
+      enumerable: false,
+      configurable: true
+    });
+  } else if (lastOpt.isGeneratedWriteIn) {
+    delete lastOpt.isGeneratedWriteIn;
+  }
+  return paneOpts;
+}
 function correlatesQuestionInvocation(call, delivery) {
   if (!call) return false;
   const tn = (delivery.toolName ?? "").toLowerCase().trim();
@@ -5898,6 +6154,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
         return null;
       }
     }
+    let replacedHookCall;
+    let replacedWasHookPrompt = false;
+    let replacedHookWasDisplayOnly = false;
     if (candidate.kind === "question") {
       const paneQuestionText = candidate.headerText || candidate.fullHeaderLine;
       const candidateSemanticKey = buildApprovalSemanticKey(candidate);
@@ -5914,7 +6173,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           const qOptTexts = (targetQ.options || []).map((o) => normOpt(typeof o === "string" ? o : o.text));
           const cOptTexts = (candidate.options || []).map((o) => normOpt(typeof o === "string" ? o : o.text));
           if (cOptTexts.length > 0 && qOptTexts.length > 0) {
-            const hasTrailingWriteIn = cOptTexts.length === qOptTexts.length + 1 && /^\s*write-?in\b/i.test(cOptTexts[cOptTexts.length - 1]);
+            const hasTrailingWriteIn = cOptTexts.length === qOptTexts.length + 1 && /^\s*write-?in(?:\.{3}|…)?\s*$/i.test(cOptTexts[cOptTexts.length - 1]);
             const cEffectiveTexts = hasTrailingWriteIn ? cOptTexts.slice(0, -1) : cOptTexts;
             const matchedQCount = qOptTexts.filter((q) => cEffectiveTexts.includes(q)).length;
             const matchedCCount = cEffectiveTexts.filter((c) => qOptTexts.includes(c)).length;
@@ -5948,6 +6207,20 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           }
         }
         if (bestStepIdx === -1) {
+          const currentStepEval = scoreStep(currentActiveIdx);
+          if (currentStepEval.textMatch) {
+            const existing = [...this.pendingPrompts.values()].find(
+              (p) => p.conversationId === conversationId && p.kind === "question"
+            );
+            if (existing && Object.keys(existing.submitMap || {}).length > 0) {
+              existing.submitMap = {};
+              if (existing.paneOptions && existing.paneOptions.length > 0 && existing.paneOptions[existing.paneOptions.length - 1]?.isGeneratedWriteIn) {
+                existing.paneOptions = existing.paneOptions.slice(0, -1);
+              }
+              existing.paneSemanticKey = candidateSemanticKey;
+              this.emit("prompt-upgraded", existing);
+            }
+          }
           logger.debug("Pane candidate did not match any step of active live wizard", {
             paneQuestionText,
             currentActiveIdx,
@@ -5966,47 +6239,42 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
             (p) => p.conversationId === conversationId && p.kind === "question"
           );
           if (existing) {
-            const targetQ = existing.pendingCall?.structuredQuestions?.[existing.wizardStepIndex ?? 0];
-            const isAuthoritativeMultiSelect = Boolean(targetQ?.isMultiSelect);
-            const isInitialUpgrade = existing.isHookPrompt && !isAuthoritativeMultiSelect && Object.keys(existing.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
-            if (isInitialUpgrade) {
-              existing.submitMap = candidate.submitMap;
-              if (candidate.options && candidate.options.length > 0) {
-                existing.paneOptions = candidate.options;
-              }
-              existing.paneSemanticKey = candidateSemanticKey;
-              existing.paneHash = candidate.paneHash;
-              existing.matchedPaneHeader = stepLineMatch?.stitchedHeaderText ?? candidate.headerText ?? existing.matchedPaneHeader;
-              existing.paneDisplayHeader = stepLineMatch?.stitchedFullHeaderLine ?? candidate.fullHeaderLine ?? existing.paneDisplayHeader;
-              existing.body = stepLineMatch ? stepLineMatch.remainingBody || void 0 : candidate.body;
-              if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
-              logger.info("Upgraded hook-driven question prompt to actionable from pane observer", {
-                promptId: existing.promptId,
-                optionsCount: existing.paneOptions?.length ?? 0
-              });
-              this.emit("prompt-upgraded", existing);
-              return existing;
-            }
-            const areControlsMutated = (existingOpts, candidateOpts) => {
-              if (!existingOpts || !candidateOpts) return false;
-              if (existingOpts.length !== candidateOpts.length) return true;
-              return !existingOpts.every((o, idx) => o.number === candidateOpts[idx].number && (o.text || "").trim() === (candidateOpts[idx].text || "").trim());
-            };
-            const isControlDelta = Boolean(
-              existing.paneOptions && existing.paneOptions.length > 0 && candidate.options && candidate.options.length > 0 && areControlsMutated(existing.paneOptions, candidate.options)
-            );
-            if (isControlDelta) {
-              logger.info("Control delta observed on active question step; resolving old prompt and re-emitting", {
-                oldPromptId: existing.promptId,
-                oldSemanticKey: existing.paneSemanticKey,
-                newSemanticKey: candidateSemanticKey
-              });
+            const nextBody = stepLineMatch ? stepLineMatch.remainingBody || void 0 : candidate.body || void 0;
+            const bodyChangedAfterObservation = Boolean(existing.paneBodyObserved) && existing.body !== nextBody;
+            if (bodyChangedAfterObservation) {
+              replacedHookCall = existing.pendingCall;
+              replacedWasHookPrompt = Boolean(existing.isHookPrompt);
+              replacedHookWasDisplayOnly = Object.keys(existing.submitMap || {}).length === 0;
               this.resolvePrompt(existing.promptId, { advanceWizard: false });
               this.emit("prompt-resolved", existing.promptId);
             } else {
-              if (!existing.paneSemanticKey) {
-                existing.paneSemanticKey = candidateSemanticKey;
+              const targetQ = existing.pendingCall?.structuredQuestions?.[existing.wizardStepIndex ?? 0];
+              const isAuthoritativeMultiSelect = Boolean(
+                existing.pendingCall?.isMultiSelect || targetQ?.isMultiSelect
+              );
+              const isOptionsTruncated = Boolean(
+                existing.pendingCall?.optionsTruncated || targetQ?.optionsTruncated
+              );
+              const hasExplicitEmptyOptions = Boolean(
+                targetQ && Array.isArray(targetQ.options) && targetQ.options.length === 0
+              );
+              let adoptedFallbackOptions = false;
+              if (!isAuthoritativeMultiSelect && !isOptionsTruncated && !hasExplicitEmptyOptions && Object.keys(existing.submitMap || {}).length === 0 && (!existing.paneOptions || existing.paneOptions.length === 0) && Object.keys(candidate.submitMap || {}).length > 0) {
+                existing.submitMap = candidate.submitMap;
+                if (candidate.options && candidate.options.length > 0) {
+                  existing.paneOptions = tagPaneGeneratedWriteInOption(candidate.options, targetQ?.options);
+                }
+                adoptedFallbackOptions = true;
+              }
+              const candidateIsActionable = Object.keys(candidate.submitMap || {}).length > 0;
+              const optionsMatch = hookOptionsMatchPaneOptions(existing.paneOptions, candidate.options);
+              const exactControlsMatch = adoptedFallbackOptions || candidateIsActionable && optionsMatch && (existing.paneOptions?.length ?? 0) === (candidate.options?.length ?? 0) && (existing.paneOptions ?? []).every(
+                (o, i) => o.number === candidate.options[i]?.number && JSON.stringify(existing.submitMap?.[o.number]) === JSON.stringify(candidate.submitMap?.[o.number])
+              );
+              if (existing.paneHash && existing.paneHash !== candidate.paneHash) {
+                this.paneOnlyEmittedHashes.delete(existing.paneHash);
               }
+              existing.paneHash = candidate.paneHash;
               if (stepLineMatch) {
                 existing.matchedPaneHeader = stepLineMatch.stitchedHeaderText;
                 existing.paneDisplayHeader = stepLineMatch.stitchedFullHeaderLine;
@@ -6014,8 +6282,19 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
                 if (existing.pendingCall && targetStepQ?.question) {
                   existing.pendingCall.questionText = stepLineMatch.stitchedHeaderText;
                 }
-              } else if (candidate.body) {
-                existing.body = candidate.body;
+              } else {
+                existing.body = nextBody;
+              }
+              existing.paneBodyObserved = true;
+              if (exactControlsMatch) {
+                existing.paneSemanticKey = candidateSemanticKey;
+              } else if ((!candidateIsActionable || !optionsMatch) && Object.keys(existing.submitMap || {}).length > 0) {
+                existing.submitMap = {};
+                if (existing.paneOptions && existing.paneOptions.length > 0 && existing.paneOptions[existing.paneOptions.length - 1]?.isGeneratedWriteIn) {
+                  existing.paneOptions = existing.paneOptions.slice(0, -1);
+                }
+                existing.paneSemanticKey = candidateSemanticKey;
+                this.emit("prompt-upgraded", existing);
               }
               if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
               return null;
@@ -6042,44 +6321,86 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
             const lineMatch = matchPaneQuestionLines(hookQuestionText, candidate);
             const isSameQuestion = lineMatch !== null;
             if (isSameQuestion) {
-              const targetQ = p.pendingCall?.structuredQuestions?.[p.wizardStepIndex ?? 0];
-              const isAuthoritativeMultiSelect = Boolean(targetQ?.isMultiSelect);
-              const isInitialUpgrade = p.isHookPrompt && !isAuthoritativeMultiSelect && Object.keys(p.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
-              const isControlDelta = !isInitialUpgrade && Boolean(
-                p.paneSemanticKey && candidateSemanticKey !== p.paneSemanticKey
-              );
-              if (!isControlDelta) {
-                if (isInitialUpgrade) {
-                  p.submitMap = candidate.submitMap;
-                  if (candidate.options && candidate.options.length > 0) {
-                    p.paneOptions = candidate.options;
+              if (p.isHookPrompt) {
+                const nextBody = lineMatch ? lineMatch.remainingBody || void 0 : candidate.body || void 0;
+                const bodyChangedAfterObservation = Boolean(p.paneBodyObserved) && p.body !== nextBody;
+                if (!bodyChangedAfterObservation) {
+                  const targetQ = p.pendingCall?.structuredQuestions?.[p.wizardStepIndex ?? 0];
+                  const isAuthoritativeMultiSelect = Boolean(
+                    p.pendingCall?.isMultiSelect || targetQ?.isMultiSelect
+                  );
+                  const isOptionsTruncated = Boolean(
+                    p.pendingCall?.optionsTruncated || targetQ?.optionsTruncated
+                  );
+                  let adoptedFallbackOptions = false;
+                  if (!isAuthoritativeMultiSelect && !isOptionsTruncated && Object.keys(p.submitMap || {}).length === 0 && (!p.paneOptions || p.paneOptions.length === 0) && Object.keys(candidate.submitMap || {}).length > 0) {
+                    p.submitMap = candidate.submitMap;
+                    if (candidate.options && candidate.options.length > 0) {
+                      p.paneOptions = tagPaneGeneratedWriteInOption(
+                        candidate.options,
+                        targetQ?.options ?? p.pendingCall?.questionOptions
+                      );
+                    }
+                    adoptedFallbackOptions = true;
+                  }
+                  const candidateIsActionable = Object.keys(candidate.submitMap || {}).length > 0;
+                  const optionsMatch = hookOptionsMatchPaneOptions(p.paneOptions, candidate.options);
+                  const exactControlsMatch = adoptedFallbackOptions || candidateIsActionable && optionsMatch && (p.paneOptions?.length ?? 0) === (candidate.options?.length ?? 0) && (p.paneOptions ?? []).every(
+                    (o, i) => o.number === candidate.options[i]?.number && JSON.stringify(p.submitMap?.[o.number]) === JSON.stringify(candidate.submitMap?.[o.number])
+                  );
+                  if (p.paneHash && p.paneHash !== candidate.paneHash) {
+                    this.paneOnlyEmittedHashes.delete(p.paneHash);
                   }
-                  p.paneSemanticKey = candidateSemanticKey;
                   p.paneHash = candidate.paneHash;
-                  p.matchedPaneHeader = lineMatch?.stitchedHeaderText ?? candidate.headerText ?? p.matchedPaneHeader;
-                  p.paneDisplayHeader = lineMatch?.stitchedFullHeaderLine ?? candidate.fullHeaderLine ?? p.paneDisplayHeader;
-                  p.body = lineMatch ? lineMatch.remainingBody || void 0 : candidate.body;
+                  if (lineMatch) {
+                    p.matchedPaneHeader = lineMatch.stitchedHeaderText;
+                    p.paneDisplayHeader = lineMatch.stitchedFullHeaderLine;
+                    p.body = lineMatch.remainingBody || void 0;
+                    if (p.pendingCall) {
+                      p.pendingCall.questionText = lineMatch.stitchedHeaderText;
+                    }
+                  } else {
+                    p.body = nextBody;
+                  }
+                  p.paneBodyObserved = true;
+                  if (exactControlsMatch) {
+                    p.paneSemanticKey = candidateSemanticKey;
+                  } else if ((!candidateIsActionable || !optionsMatch) && Object.keys(p.submitMap || {}).length > 0) {
+                    p.submitMap = {};
+                    if (p.paneOptions && p.paneOptions.length > 0 && p.paneOptions[p.paneOptions.length - 1]?.isGeneratedWriteIn) {
+                      p.paneOptions = p.paneOptions.slice(0, -1);
+                    }
+                    p.paneSemanticKey = candidateSemanticKey;
+                    this.emit("prompt-upgraded", p);
+                  }
                   if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
-                  logger.info("Upgraded hook-driven question prompt to actionable from pane observer", {
-                    promptId: p.promptId,
-                    optionsCount: p.paneOptions?.length ?? 0
-                  });
-                  this.emit("prompt-upgraded", p);
-                  return p;
+                  return null;
                 }
-                if (!p.paneSemanticKey) {
-                  p.paneSemanticKey = candidateSemanticKey;
-                }
-                if (lineMatch) {
-                  p.matchedPaneHeader = lineMatch.stitchedHeaderText;
-                  p.paneDisplayHeader = lineMatch.stitchedFullHeaderLine;
-                  p.body = lineMatch.remainingBody || void 0;
-                  if (p.pendingCall) {
-                    p.pendingCall.questionText = lineMatch.stitchedHeaderText;
+              }
+              if (!p.isHookPrompt) {
+                const isControlDelta = Boolean(
+                  p.paneSemanticKey && candidateSemanticKey !== p.paneSemanticKey
+                );
+                if (!isControlDelta) {
+                  if (!p.paneSemanticKey) {
+                    p.paneSemanticKey = candidateSemanticKey;
                   }
+                  if (lineMatch) {
+                    p.matchedPaneHeader = lineMatch.stitchedHeaderText;
+                    p.paneDisplayHeader = lineMatch.stitchedFullHeaderLine;
+                    p.body = lineMatch.remainingBody || void 0;
+                    if (p.pendingCall) {
+                      p.pendingCall.questionText = lineMatch.stitchedHeaderText;
+                    }
+                  }
+                  p.paneBodyObserved = true;
+                  if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+                  return null;
                 }
-                if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
-                return null;
+              } else {
+                replacedHookCall = p.pendingCall;
+                replacedWasHookPrompt = true;
+                replacedHookWasDisplayOnly = Object.keys(p.submitMap || {}).length === 0;
               }
             }
             this.resolvePrompt(p.promptId);
@@ -6090,14 +6411,35 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     }
     const promptId = forcedPromptId ?? (0, import_uuid2.v4)();
     const liveWizard = candidate.kind === "question" ? this.liveWizardInvocations.get(conversationId) : void 0;
-    const matchingCall = liveWizard ? liveWizard.call : candidate.kind === "question" ? this.findMatchingPendingCall(candidate, conversationId) : null;
+    const matchingCall = liveWizard ? liveWizard.call : candidate.kind === "question" ? this.findMatchingPendingCall(candidate, conversationId) ?? replacedHookCall ?? null : null;
     if (liveWizard) {
       liveWizard.promptId = promptId;
     } else if (matchingCall) {
       matchingCall.matchedPromptId = promptId;
     }
-    const matchedStepQuestionText = candidate.kind === "question" ? liveWizard?.call.structuredQuestions?.[liveWizard.activeStepIndex ?? 0]?.question ?? matchingCall?.structuredQuestions?.find((sq) => paneCandidateMatchesQuestion(sq.question, candidate))?.question ?? matchingCall?.questionText : void 0;
+    const matchedStructuredQuestion = candidate.kind === "question" ? liveWizard?.call.structuredQuestions?.[liveWizard.activeStepIndex ?? 0] ?? matchingCall?.structuredQuestions?.find((sq) => paneCandidateMatchesQuestion(sq.question, candidate)) : void 0;
+    const matchedStepQuestionText = candidate.kind === "question" ? matchedStructuredQuestion?.question ?? matchingCall?.questionText : void 0;
     const synthLineMatch = candidate.kind === "question" && matchedStepQuestionText ? matchPaneQuestionLines(matchedStepQuestionText, candidate) : null;
+    const activeHookStepOpts = candidate.kind === "question" ? matchedStructuredQuestion?.options ?? matchingCall?.questionOptions : void 0;
+    const isHookRestrictedMultiSelect = Boolean(
+      matchingCall?.isMultiSelect || matchedStructuredQuestion?.isMultiSelect
+    );
+    const isHookRestrictedTruncated = Boolean(
+      matchingCall?.optionsTruncated || matchedStructuredQuestion?.optionsTruncated
+    );
+    const hasExplicitEmptyHookStepOpts = Boolean(
+      matchedStructuredQuestion && Array.isArray(matchedStructuredQuestion.options) && matchedStructuredQuestion.options.length === 0
+    );
+    const hookRawStepOpts = (activeHookStepOpts ?? []).map(
+      (o, idx) => typeof o === "string" ? { number: String(idx + 1), text: o } : { number: String(o.number ?? idx + 1), text: o.text }
+    );
+    const hasHookStepOptionMismatch = candidate.kind === "question" && candidate.options.length > 0 && (hasExplicitEmptyHookStepOpts || hookRawStepOpts.length > 0 && !hookOptionsMatchPaneOptions(hookRawStepOpts, candidate.options));
+    const isHookCall = Boolean(
+      replacedWasHookPrompt || matchingCall?.structuredQuestions && matchingCall.structuredQuestions.length > 0
+    );
+    const isHookRestricted = candidate.kind === "question" && isHookCall && (replacedHookWasDisplayOnly || isHookRestrictedMultiSelect || isHookRestrictedTruncated || hasHookStepOptionMismatch);
+    const effectiveSubmitMap = isHookRestricted ? {} : candidate.submitMap;
+    const taggedCandidateOptions = candidate.kind === "question" ? isHookRestricted ? candidate.options : tagPaneGeneratedWriteInOption(candidate.options, activeHookStepOpts) : candidate.options;
     const syntheticCall = {
       conversationId,
       intentStepIndex: matchingCall?.intentStepIndex ?? -1,
@@ -6115,26 +6457,26 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       // NOTE (Codex R3-F1 / Claude R3-F2): Pane options are authoritative ground truth
       // that directly correspond to desktop keystrokes (submitMap). Transcript options
       // serve solely as fallback when pane options cannot be parsed.
-      questionOptions: candidate.kind === "question" && candidate.options && candidate.options.length > 0 ? candidate.options : matchingCall?.questionOptions,
+      questionOptions: candidate.kind === "question" && taggedCandidateOptions && taggedCandidateOptions.length > 0 ? taggedCandidateOptions : matchingCall?.questionOptions,
       structuredQuestions: matchingCall?.structuredQuestions,
+      isMultiSelect: matchingCall?.isMultiSelect ?? matchedStructuredQuestion?.isMultiSelect,
+      optionsTruncated: matchingCall?.optionsTruncated ?? matchedStructuredQuestion?.optionsTruncated,
       promptId,
       startedAt: matchingCall?.startedAt ?? Date.now(),
       intentCreatedAt: matchingCall?.intentCreatedAt ?? (/* @__PURE__ */ new Date()).toISOString()
     };
-    const isHookCall = Boolean(
-      matchingCall?.structuredQuestions && matchingCall.structuredQuestions.length > 0
-    );
     const state = {
       promptId,
       conversationId,
       pendingCall: syntheticCall,
-      submitMap: candidate.submitMap,
+      submitMap: effectiveSubmitMap,
       matchedPaneHeader: synthLineMatch?.stitchedHeaderText ?? candidate.headerText,
       paneDisplayHeader: synthLineMatch?.stitchedFullHeaderLine ?? candidate.fullHeaderLine,
       body: synthLineMatch ? synthLineMatch.remainingBody || void 0 : candidate.body,
-      paneOptions: candidate.options,
-      paneSemanticKey: buildApprovalSemanticKey(candidate),
-      paneRedrawSemanticKey: buildApprovalRedrawSemanticKey(candidate),
+      paneBodyObserved: true,
+      paneOptions: taggedCandidateOptions,
+      paneSemanticKey: buildApprovalSemanticKey({ ...candidate, submitMap: effectiveSubmitMap }),
+      paneRedrawSemanticKey: buildApprovalRedrawSemanticKey({ ...candidate, submitMap: effectiveSubmitMap }),
       kind: candidate.kind,
       isHookPrompt: isHookCall,
       // Carry hook ownership forward so pane redraws do not drop it! (Codex S2-Codex-R6-F15)
@@ -6184,6 +6526,15 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           if (p.pendingCall) {
             p.pendingCall.questionText = hookLineMatch?.stitchedHeaderText ?? call.questionText ?? p.pendingCall.questionText;
             p.pendingCall.structuredQuestions = call.structuredQuestions;
+            if (call.questionOptions) {
+              p.pendingCall.questionOptions = call.questionOptions;
+            }
+            if (call.isMultiSelect !== void 0) {
+              p.pendingCall.isMultiSelect = call.isMultiSelect;
+            }
+            if (call.optionsTruncated !== void 0) {
+              p.pendingCall.optionsTruncated = call.optionsTruncated;
+            }
             if (call.intentStepIndex !== -1) {
               p.pendingCall.intentStepIndex = call.intentStepIndex;
             }
@@ -6192,25 +6543,38 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           } else {
             p.pendingCall = call;
           }
-          const isHookMultiSelect = Boolean(
+          const isHookMultiSelect2 = Boolean(
             call.isMultiSelect || call.structuredQuestions && call.structuredQuestions[0]?.isMultiSelect
           );
-          const normOpt = (s) => s.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
-          const hookRawOpts = call.structuredQuestions?.[0]?.options ?? call.questionOptions ?? [];
-          const qOptTexts = hookRawOpts.map((o) => normOpt(typeof o === "string" ? o : o.text));
-          const cOptTexts = (p.paneOptions || []).map((o) => normOpt(typeof o === "string" ? o : o.text));
-          const hasTrailingWriteIn = cOptTexts.length === qOptTexts.length + 1 && /^\s*write-?in\b/i.test(cOptTexts[cOptTexts.length - 1]);
-          const cEffectiveTexts = hasTrailingWriteIn ? cOptTexts.slice(0, -1) : cOptTexts;
+          const isHookOptionsTruncated2 = Boolean(
+            call.optionsTruncated || call.structuredQuestions && call.structuredQuestions[0]?.optionsTruncated
+          );
+          const hookRawOpts = (call.structuredQuestions?.[0]?.options ?? call.questionOptions ?? []).map(
+            (o, idx) => typeof o === "string" ? { number: String(idx + 1), text: o } : { number: String(o.number ?? idx + 1), text: o.text }
+          );
+          const paneOptsNormalized = (p.paneOptions || []).map(
+            (o, idx) => typeof o === "string" ? { number: String(idx + 1), text: o } : {
+              number: String(o.number ?? idx + 1),
+              text: o.text,
+              isGeneratedWriteIn: Boolean(o.isGeneratedWriteIn)
+            }
+          );
           const hasStructuredQuestion = Boolean(call.structuredQuestions && call.structuredQuestions.length > 0);
-          const hasHookOptionMismatch = cOptTexts.length > 0 && (hasStructuredQuestion && qOptTexts.length === 0 || qOptTexts.length > 0 && (cEffectiveTexts.length !== qOptTexts.length || qOptTexts.some((q) => !cEffectiveTexts.includes(q)) || cEffectiveTexts.some((c) => !qOptTexts.includes(c))));
-          if ((isHookMultiSelect || hasHookOptionMismatch) && Object.keys(p.submitMap || {}).length > 0) {
+          const hasHookOptionMismatch = paneOptsNormalized.length > 0 && (hasStructuredQuestion && hookRawOpts.length === 0 || hookRawOpts.length > 0 && !hookOptionsMatchPaneOptions(hookRawOpts, paneOptsNormalized));
+          if ((isHookMultiSelect2 || isHookOptionsTruncated2 || hasHookOptionMismatch) && Object.keys(p.submitMap || {}).length > 0) {
             p.submitMap = {};
-            logger.info("emitHookQuestionPrompt: revoked actionable submitMap due to multi-select or option mismatch", {
+            logger.info("emitHookQuestionPrompt: revoked actionable submitMap due to multi-select, truncation, or option mismatch", {
               promptId: p.promptId,
-              isHookMultiSelect,
+              isHookMultiSelect: isHookMultiSelect2,
+              isHookOptionsTruncated: isHookOptionsTruncated2,
               hasHookOptionMismatch
             });
             this.emit("prompt-upgraded", p);
+          } else if (p.paneOptions && p.paneOptions.length > 0 && Object.keys(p.submitMap || {}).length > 0) {
+            p.paneOptions = tagPaneGeneratedWriteInOption(
+              p.paneOptions,
+              hookRawOpts.length > 0 ? hookRawOpts : void 0
+            );
           }
           p.isHookPrompt = true;
           call.matchedPromptId = p.promptId;
@@ -6241,21 +6605,38 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     const promptId = forcedPromptId ?? (0, import_uuid2.v4)();
     this.registerPendingCall(call);
     call.matchedPromptId = promptId;
+    const firstStructured = call.structuredQuestions?.[0];
+    const isHookMultiSelect = Boolean(
+      call.isMultiSelect || firstStructured?.isMultiSelect
+    );
+    const isHookOptionsTruncated = Boolean(
+      call.optionsTruncated || firstStructured?.optionsTruncated
+    );
+    const hasExplicitEmptyStructuredOptions = Boolean(
+      firstStructured && Array.isArray(firstStructured.options) && firstStructured.options.length === 0
+    );
+    const rawOptions = hasExplicitEmptyStructuredOptions ? [] : firstStructured?.options && firstStructured.options.length > 0 ? firstStructured.options : call.questionOptions;
+    const { paneOptions, submitMap } = buildHookQuestionOptionsAndSubmitMap(
+      rawOptions,
+      isHookMultiSelect,
+      isHookOptionsTruncated
+    );
     const state = {
       promptId,
       conversationId: call.conversationId,
       pendingCall: call,
-      submitMap: {},
+      submitMap,
       matchedPaneHeader: call.questionText ?? "Question",
       paneDisplayHeader: call.questionText ?? "Question",
       body: void 0,
-      paneOptions: call.questionOptions,
+      paneBodyObserved: false,
+      paneOptions,
       paneSemanticKey: buildApprovalSemanticKey({
         kind: "question",
         headerText: call.questionText ?? "Question",
         fullHeaderLine: call.questionText ?? "Question",
-        options: call.questionOptions ?? [],
-        submitMap: {},
+        options: paneOptions ?? [],
+        submitMap,
         body: "",
         paneHash: ""
       }),
@@ -6278,7 +6659,8 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       promptId,
       conversationId: call.conversationId,
       questionText: call.questionText,
-      optionsCount: call.questionOptions?.length ?? 0
+      optionsCount: paneOptions?.length ?? 0,
+      mobileActionable: Object.keys(submitMap).length > 0
     });
     this.emit("pending-prompt", state);
     return state;
@@ -6789,9 +7171,13 @@ var PromptResponder = class {
         };
       }
       const isQuestionPrompt = state.kind === "question";
-      const expectedStep = (state.paneDisplayHeader || "").match(/\bQuestion\s+(\d+(?:[\/:of\s]+\d+)?):/i)?.[1];
+      let expectedStep = (state.paneDisplayHeader || "").match(/\bQuestion\s+(\d+(?:[\/:of\s]+\d+)?):/i)?.[1];
       const matchingOpt = state.paneOptions?.find((o) => String(o.number) === String(optionNumber));
-      const isWriteInOption = matchingOpt ? /^\s*write-?in\b/i.test(matchingOpt.text) : false;
+      const activeStepHookOpts = state.pendingCall?.structuredQuestions?.[state.wizardStepIndex ?? 0]?.options ?? state.pendingCall?.questionOptions;
+      const hookBaseOptCount = activeStepHookOpts ? activeStepHookOpts.filter((o) => !o.isGeneratedWriteIn).length : 0;
+      const isWriteInOption = matchingOpt ? Boolean(
+        matchingOpt.isGeneratedWriteIn || matchingOpt === state.paneOptions?.[state.paneOptions.length - 1] && /^\s*write-?in(?:\.{3}|…)?\s*$/i.test(matchingOpt.text) && (!state.isHookPrompt || hookBaseOptCount === 0 || (state.paneOptions?.length ?? 0) === hookBaseOptCount + 1)
+      ) : false;
       if (isQuestionPrompt) {
         if (state.paneOptions && state.paneOptions.length > 0 && !matchingOpt) {
           return {
@@ -6849,9 +7235,10 @@ var PromptResponder = class {
             };
           }
           let liveSemanticKey = null;
+          let liveCandidate = null;
           try {
-            const snapshot = await this.paneObserver.captureSnapshot();
-            const postCapturePrompt = this.detector.getPendingPrompt(promptId);
+            let snapshot = await this.paneObserver.captureSnapshot();
+            let postCapturePrompt = this.detector.getPendingPrompt(promptId);
             if (postCapturePrompt !== state || !postCapturePrompt.submitMap || !postCapturePrompt.submitMap[optionNumber]) {
               return {
                 ok: false,
@@ -6868,7 +7255,35 @@ var PromptResponder = class {
                 deliveryPhase: "none"
               };
             }
-            const live = parseApprovalSnapshot(snapshot);
+            let live = parseApprovalSnapshot(snapshot);
+            if (!live && isQuestionPrompt && state.isHookPrompt && !state.paneHash && detectActivePromptKind(snapshot) === null) {
+              const waitDeadline = Date.now() + 250;
+              while (!live && Date.now() < waitDeadline) {
+                await delay(50);
+                snapshot = await this.paneObserver.captureSnapshot();
+                postCapturePrompt = this.detector.getPendingPrompt(promptId);
+                if (postCapturePrompt !== state || !postCapturePrompt.submitMap || !postCapturePrompt.submitMap[optionNumber]) {
+                  return {
+                    ok: false,
+                    reason: "prompt-expired",
+                    details: "option is no longer actionable on active prompt (controls revoked or updated)",
+                    deliveryPhase
+                  };
+                }
+                live = parseApprovalSnapshot(snapshot);
+                if (!live && detectActivePromptKind(snapshot) !== null) {
+                  break;
+                }
+              }
+              if (!live && detectActivePromptKind(snapshot) === null && !state.paneHash) {
+                return {
+                  ok: false,
+                  reason: "prompt-probe-failed",
+                  details: "the question chooser has not rendered on the terminal yet; please retry in a moment",
+                  deliveryPhase
+                };
+              }
+            }
             if (!live) {
               if (detectActivePromptKind(snapshot) === null) {
                 this.detector.resolvePrompt(promptId);
@@ -6886,6 +7301,7 @@ var PromptResponder = class {
                 deliveryPhase
               };
             }
+            liveCandidate = live;
             liveSemanticKey = live ? buildApprovalSemanticKey(live) : null;
           } catch (error) {
             return {
@@ -6895,15 +7311,55 @@ var PromptResponder = class {
               deliveryPhase
             };
           }
-          if (liveSemanticKey !== state.paneSemanticKey) {
+          if (!liveCandidate || !liveCandidate.submitMap?.[optionNumber]?.length) {
             this.detector.resolvePrompt(promptId);
             return {
               ok: false,
               reason: "prompt-superseded",
-              details: "active chooser semantics differ from the mobile prompt",
+              details: "active chooser does not allow actionable submission for this option",
               deliveryPhase
             };
           }
+          if (liveSemanticKey !== state.paneSemanticKey) {
+            let hookQuestionMatchesLive = false;
+            if (isQuestionPrompt && state.isHookPrompt && liveCandidate && liveCandidate.kind === "question") {
+              const activeStepQ = state.pendingCall?.structuredQuestions?.[state.wizardStepIndex ?? 0];
+              const hookQuestionText = activeStepQ?.question ?? state.pendingCall?.questionText ?? state.matchedPaneHeader;
+              const lineMatch = matchPaneQuestionLines(hookQuestionText, liveCandidate);
+              const liveRemainingBody = lineMatch ? lineMatch.remainingBody || void 0 : liveCandidate.body || void 0;
+              const bodyConsistent = !state.paneBodyObserved || state.body === liveRemainingBody;
+              const normOpt = (s) => s.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
+              const optionsMatch = hookOptionsMatchPaneOptions(state.paneOptions, liveCandidate.options);
+              const selectedLiveOpt = (liveCandidate.options ?? []).find(
+                (o) => String(o.number) === String(optionNumber)
+              );
+              const selectedOptMatches = isWriteInOption ? Boolean(selectedLiveOpt && /^\s*write-?in(?:\.{3}|…)?\s*$/i.test(selectedLiveOpt.text)) : Boolean(
+                selectedLiveOpt && matchingOpt && normOpt(selectedLiveOpt.text) === normOpt(matchingOpt.text)
+              );
+              if (lineMatch !== null && bodyConsistent && optionsMatch && selectedOptMatches && Boolean(liveCandidate.submitMap[optionNumber]?.length)) {
+                hookQuestionMatchesLive = true;
+                state.matchedPaneHeader = lineMatch.stitchedHeaderText;
+                state.paneDisplayHeader = lineMatch.stitchedFullHeaderLine;
+                state.body = liveRemainingBody;
+                state.paneBodyObserved = true;
+                if (liveSemanticKey) {
+                  state.paneSemanticKey = liveSemanticKey;
+                }
+                expectedStep = (state.paneDisplayHeader || "").match(/\bQuestion\s+(\d+(?:[\/:of\s]+\d+)?):/i)?.[1];
+              }
+            }
+            if (!hookQuestionMatchesLive) {
+              this.detector.resolvePrompt(promptId);
+              return {
+                ok: false,
+                reason: "prompt-superseded",
+                details: "active chooser semantics differ from the mobile prompt",
+                deliveryPhase
+              };
+            }
+          } else if (!state.paneBodyObserved) {
+            state.paneBodyObserved = true;
+          }
           deliveryPhase = "option_attempted";
           if (isNamedKey(key)) {
             await this.sendKey(target, key);
@@ -8970,6 +9426,7 @@ var McpServer = class _McpServer {
         questionText,
         questionOptions,
         structuredQuestions,
+        optionsTruncated: Boolean(structuredQuestions?.[0]?.optionsTruncated),
         startedAt: Date.now(),
         intentCreatedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
@@ -8997,7 +9454,19 @@ var McpServer = class _McpServer {
       });
       return;
     }
-    const e1rec = this.newE1Raise(session.sessionId, false);
+    const firstStructured = pendingCall.structuredQuestions?.[0];
+    const isMultiSelect = Boolean(
+      pendingCall.isMultiSelect || firstStructured?.isMultiSelect
+    );
+    const optionsTruncated = Boolean(
+      pendingCall.optionsTruncated || firstStructured?.optionsTruncated
+    );
+    const hasExplicitEmptyStructuredOptions = Boolean(
+      firstStructured && Array.isArray(firstStructured.options) && firstStructured.options.length === 0
+    );
+    const rawOpts = hasExplicitEmptyStructuredOptions ? [] : firstStructured?.options && firstStructured.options.length > 0 ? firstStructured.options : pendingCall.questionOptions;
+    const isInitiallyActionable = !isMultiSelect && !optionsTruncated && Boolean(rawOpts && rawOpts.length > 0 && rawOpts.length <= 8);
+    const e1rec = this.newE1Raise(session.sessionId, isInitiallyActionable);
     const emitted = this.approvalDetector.emitHookQuestionPrompt(pendingCall, e1rec.promptId);
     if (!emitted) {
       this.e1PromptRaises.delete(e1rec.promptId);
@@ -10437,7 +10906,7 @@ var McpServer = class _McpServer {
               } else if (optionResult.reason === "prompt-expired" || optionResult.reason === "prompt-superseded") {
                 message = "The question prompt on desktop has expired or changed. Please review on desktop.";
               } else if (optionResult.reason === "prompt-probe-failed") {
-                message = "Write-in input field was not ready on desktop. Please try again or respond on desktop.";
+                message = optionResult.details?.includes("has not rendered on the terminal yet") ? optionResult.details : intent.followUpText ? "Write-in input field was not ready on desktop. Please try again or respond on desktop." : "Question prompt was not ready on desktop. Please try again or respond on desktop.";
               } else if (optionResult.reason === "no-tmux-target" || optionResult.reason === "tmux-failed") {
                 message = optionResult.details || "Desktop terminal session is unreachable. Please respond directly on desktop.";
               } else if (optionResult.reason === "display-only-question-active") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.102",
+  "version": "2.0.104",
   "description": "Control Antigravity CLI from your iPhone and Android — real-time sync, approve file edits, send prompts by voice. Part of CodeVibe.",
   "main": "dist/server.js",
   "codevibe": {