@quantiya/codevibe-antigravity-plugin 2.0.99 → 2.0.100

package/dist/server.js

@@ -4475,7 +4475,7 @@ function buildQuestionSubmitMap(options) {
   }
   return map;
 }
-function isWriteInInputActive(paneText, expectedHeader, expectedStep) {
+function isWriteInInputActive(paneText, expectedHeader, expectedStep, expectedBodyText) {
   if (!paneText) return false;
   if (detectActivePromptKind(paneText) !== "question") return false;
   const stripped = paneText.replace(ANSI_ESCAPE_REGEX2, "");
@@ -4493,10 +4493,27 @@ function isWriteInInputActive(paneText, expectedHeader, expectedStep) {
   const extracted = extractQuestionHeader(rawHeader);
   if (!extracted) return false;
   if (expectedHeader) {
+    const normHeaderBlock = (s) => s.replace(/^[❯>\s*•-]+\s*/, "").replace(/\s+/g, " ").trim().toLowerCase();
     const expectedExtracted = extractQuestionHeader(expectedHeader);
-    const expectedBody = (expectedExtracted ? expectedExtracted.body : expectedHeader).replace(/^[❯>\s*•-]+\s*/, "").trim().toLowerCase();
-    const paneBody = extracted.body.replace(/^[❯>\s*•-]+\s*/, "").trim().toLowerCase();
-    if (paneBody !== expectedBody) {
+    const baseExpectedHeader = expectedExtracted ? expectedExtracted.body : expectedHeader;
+    const expectedBodyLines = expectedBodyText ? expectedBodyText.split("\n").map((l) => l.trim()).filter(Boolean) : [];
+    const allowedExpectedBodies = /* @__PURE__ */ new Set();
+    for (let j = 0; j <= expectedBodyLines.length; j++) {
+      allowedExpectedBodies.add(
+        normHeaderBlock([baseExpectedHeader, ...expectedBodyLines.slice(0, j)].join(" "))
+      );
+    }
+    const contLines = [];
+    for (let j = headerIdx + 1; j < lines.length; j++) {
+      const t = lines[j].trim();
+      if (!t) continue;
+      if (/^Your answer:\s*/i.test(t) || t.startsWith("(Enter to submit") || t.includes("Navigate") && t.includes("Select") || t.startsWith("\u2191/\u2193") || /^[❯>\s]*\d+\.\s+/.test(lines[j]) || /^[─━═-]{4,}$/.test(t)) {
+        break;
+      }
+      contLines.push(t);
+    }
+    const paneBody = normHeaderBlock([extracted.body, ...contLines].join(" "));
+    if (!allowedExpectedBodies.has(paneBody)) {
       return false;
     }
   }
@@ -5059,6 +5076,33 @@ function questionsMatch(hookText, paneText) {
   if (!h || !p) return false;
   return h === p;
 }
+function matchPaneQuestionLines(hookText, candidate) {
+  const firstHeaderText = (candidate.headerText || candidate.fullHeaderLine || "").trim();
+  const firstFullHeaderLine = (candidate.fullHeaderLine || candidate.headerText || "").trim();
+  if (!hookText || !firstHeaderText) return null;
+  const rawBodyLines = candidate.body ? candidate.body.split("\n") : [];
+  for (let k = 0; k <= rawBodyLines.length; k++) {
+    if (k > 0 && !rawBodyLines[k - 1].trim()) {
+      break;
+    }
+    const consumedLines = rawBodyLines.slice(0, k).map((l) => l.trim()).filter(Boolean);
+    const stitchedHeaderText = [firstHeaderText, ...consumedLines].join(" ").replace(/\s+/g, " ").trim();
+    const stitchedFullHeaderLine = [firstFullHeaderLine, ...consumedLines].join(" ").replace(/\s+/g, " ").trim();
+    if (questionsMatch(hookText, stitchedHeaderText) || questionsMatch(hookText, stitchedFullHeaderLine)) {
+      const remainingBody = rawBodyLines.slice(k).join("\n").trim();
+      return {
+        matched: true,
+        stitchedHeaderText,
+        stitchedFullHeaderLine,
+        remainingBody
+      };
+    }
+  }
+  return null;
+}
+function paneCandidateMatchesQuestion(hookText, candidate) {
+  return matchPaneQuestionLines(hookText, candidate) !== null;
+}
 function correlatesQuestionInvocation(call, delivery) {
   if (!call) return false;
   const tn = (delivery.toolName ?? "").toLowerCase().trim();
@@ -5232,10 +5276,11 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
         const scoreStep = (stepIdx) => {
           if (stepIdx < 0 || stepIdx >= sqs.length) return { score: -1, textMatch: false };
           const targetQ = sqs[stepIdx];
-          const textMatch = questionsMatch(targetQ.question, paneQuestionText);
+          const textMatch = paneCandidateMatchesQuestion(targetQ.question, candidate);
           if (!textMatch) return { score: -1, textMatch: false };
-          const qOptTexts = (targetQ.options || []).map((o) => (typeof o === "string" ? o : o.text).toLowerCase().trim());
-          const cOptTexts = (candidate.options || []).map((o) => (typeof o === "string" ? o : o.text).toLowerCase().trim());
+          const normOpt = (s) => s.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
+          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 cEffectiveTexts = hasTrailingWriteIn ? cOptTexts.slice(0, -1) : cOptTexts;
@@ -5279,6 +5324,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           return null;
         }
         const targetStepQ = sqs[bestStepIdx];
+        const stepLineMatch = matchPaneQuestionLines(targetStepQ?.question, candidate);
         if (targetStepQ?.isMultiSelect) {
           candidate.submitMap = {};
         }
@@ -5298,9 +5344,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
               }
               existing.paneSemanticKey = candidateSemanticKey;
               existing.paneHash = candidate.paneHash;
-              if (candidate.headerText) existing.matchedPaneHeader = candidate.headerText;
-              if (candidate.fullHeaderLine) existing.paneDisplayHeader = candidate.fullHeaderLine;
-              if (candidate.body) existing.body = candidate.body;
+              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,
@@ -5329,7 +5375,16 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
               if (!existing.paneSemanticKey) {
                 existing.paneSemanticKey = candidateSemanticKey;
               }
-              if (candidate.body) existing.body = candidate.body;
+              if (stepLineMatch) {
+                existing.matchedPaneHeader = stepLineMatch.stitchedHeaderText;
+                existing.paneDisplayHeader = stepLineMatch.stitchedFullHeaderLine;
+                existing.body = stepLineMatch.remainingBody || void 0;
+                if (existing.pendingCall && targetStepQ?.question) {
+                  existing.pendingCall.questionText = stepLineMatch.stitchedHeaderText;
+                }
+              } else if (candidate.body) {
+                existing.body = candidate.body;
+              }
               if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
               return null;
             }
@@ -5352,7 +5407,8 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
         for (const p of [...this.pendingPrompts.values()]) {
           if (p.conversationId === conversationId && p.kind === "question") {
             const hookQuestionText = p.pendingCall?.questionText || p.matchedPaneHeader || p.paneDisplayHeader;
-            const isSameQuestion = questionsMatch(hookQuestionText, paneQuestionText);
+            const lineMatch = matchPaneQuestionLines(hookQuestionText, candidate);
+            const isSameQuestion = lineMatch !== null;
             if (isSameQuestion) {
               const targetQ = p.pendingCall?.structuredQuestions?.[p.wizardStepIndex ?? 0];
               const isAuthoritativeMultiSelect = Boolean(targetQ?.isMultiSelect);
@@ -5368,9 +5424,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
                   }
                   p.paneSemanticKey = candidateSemanticKey;
                   p.paneHash = candidate.paneHash;
-                  if (candidate.headerText) p.matchedPaneHeader = candidate.headerText;
-                  if (candidate.fullHeaderLine) p.paneDisplayHeader = candidate.fullHeaderLine;
-                  if (candidate.body) p.body = candidate.body;
+                  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 (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
                   logger.info("Upgraded hook-driven question prompt to actionable from pane observer", {
                     promptId: p.promptId,
@@ -5382,6 +5438,14 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
                 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 (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
                 return null;
               }
@@ -5400,6 +5464,8 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     } 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 synthLineMatch = candidate.kind === "question" && matchedStepQuestionText ? matchPaneQuestionLines(matchedStepQuestionText, candidate) : null;
     const syntheticCall = {
       conversationId,
       intentStepIndex: matchingCall?.intentStepIndex ?? -1,
@@ -5413,7 +5479,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       command: matchingCall?.command ?? candidate.command,
       filePath: matchingCall?.filePath ?? candidate.filePath,
       rawToolName: matchingCall?.rawToolName ?? (candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown"),
-      questionText: candidate.kind === "question" && candidate.headerText ? candidate.headerText : matchingCall?.questionText,
+      questionText: synthLineMatch?.stitchedHeaderText ?? (candidate.kind === "question" && candidate.headerText ? candidate.headerText : matchingCall?.questionText),
       // 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.
@@ -5431,9 +5497,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       conversationId,
       pendingCall: syntheticCall,
       submitMap: candidate.submitMap,
-      matchedPaneHeader: candidate.headerText,
-      paneDisplayHeader: candidate.fullHeaderLine,
-      body: candidate.body,
+      matchedPaneHeader: synthLineMatch?.stitchedHeaderText ?? candidate.headerText,
+      paneDisplayHeader: synthLineMatch?.stitchedFullHeaderLine ?? candidate.fullHeaderLine,
+      body: synthLineMatch ? synthLineMatch.remainingBody || void 0 : candidate.body,
       paneOptions: candidate.options,
       paneSemanticKey: buildApprovalSemanticKey(candidate),
       kind: candidate.kind,
@@ -5471,8 +5537,19 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       if (p.conversationId === call.conversationId && p.kind === "question") {
         const existingText = p.pendingCall?.questionText || p.matchedPaneHeader || p.paneDisplayHeader;
         const isSameInvocation = !p.pendingCall || p.pendingCall.intentStepIndex === -1 || call.intentStepIndex === -1 || p.pendingCall.intentStepIndex === call.intentStepIndex;
-        if (isSameInvocation && questionsMatch(existingText, questionText)) {
+        const hookLineMatch = matchPaneQuestionLines(questionText, {
+          headerText: p.matchedPaneHeader,
+          fullHeaderLine: p.paneDisplayHeader,
+          body: p.body
+        });
+        if (isSameInvocation && (questionsMatch(existingText, questionText) || hookLineMatch !== null)) {
+          if (hookLineMatch) {
+            p.matchedPaneHeader = hookLineMatch.stitchedHeaderText;
+            p.paneDisplayHeader = hookLineMatch.stitchedFullHeaderLine;
+            p.body = hookLineMatch.remainingBody || void 0;
+          }
           if (p.pendingCall) {
+            p.pendingCall.questionText = hookLineMatch?.stitchedHeaderText ?? call.questionText ?? p.pendingCall.questionText;
             p.pendingCall.structuredQuestions = call.structuredQuestions;
             if (call.intentStepIndex !== -1) {
               p.pendingCall.intentStepIndex = call.intentStepIndex;
@@ -5485,10 +5562,20 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           const isHookMultiSelect = Boolean(
             call.isMultiSelect || call.structuredQuestions && call.structuredQuestions[0]?.isMultiSelect
           );
-          if (isHookMultiSelect && Object.keys(p.submitMap || {}).length > 0) {
+          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 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) {
             p.submitMap = {};
-            logger.info("emitHookQuestionPrompt: revoked actionable submitMap because incoming hook is multi-select", {
-              promptId: p.promptId
+            logger.info("emitHookQuestionPrompt: revoked actionable submitMap due to multi-select or option mismatch", {
+              promptId: p.promptId,
+              isHookMultiSelect,
+              hasHookOptionMismatch
             });
             this.emit("prompt-upgraded", p);
           }
@@ -5892,7 +5979,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     if (candidate.kind === "question") {
       const questionCalls = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.resultStepIndex === void 0).filter((c) => {
         if (c.structuredQuestions && candidate.headerText) {
-          const matchesStructured = c.structuredQuestions.some((sq) => questionsMatch(sq.question, candidate.headerText));
+          const matchesStructured = c.structuredQuestions.some((sq) => paneCandidateMatchesQuestion(sq.question, candidate));
           if (matchesStructured) return true;
         }
         const associatedPromptId = c.matchedPromptId || c.promptId;
@@ -5904,9 +5991,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       if (questionCalls.length > 0 && candidate.headerText) {
         const textMatch = questionCalls.find((c) => {
           if (!c.questionText) return false;
-          if (questionsMatch(c.questionText, candidate.headerText)) return true;
+          if (paneCandidateMatchesQuestion(c.questionText, candidate)) return true;
           if (c.structuredQuestions) {
-            return c.structuredQuestions.some((sq) => questionsMatch(sq.question, candidate.headerText));
+            return c.structuredQuestions.some((sq) => paneCandidateMatchesQuestion(sq.question, candidate));
           }
           return false;
         });
@@ -6139,7 +6226,7 @@ var PromptResponder = class {
                 deliveryPhase
               };
             }
-            if (isQuestionPrompt && isWriteInInputActive(snapshot, state.matchedPaneHeader, expectedStep)) {
+            if (isQuestionPrompt && (isWriteInInputActive(snapshot, state.matchedPaneHeader, expectedStep, state.body) || isWriteInInputActive(snapshot, void 0, expectedStep))) {
               return {
                 ok: false,
                 reason: "write-in-already-active",
@@ -6199,7 +6286,7 @@ var PromptResponder = class {
               await delay(100);
               try {
                 const liveSnap = await this.paneObserver.captureSnapshot();
-                if (liveSnap && isWriteInInputActive(liveSnap, state.matchedPaneHeader, expectedStep)) {
+                if (liveSnap && isWriteInInputActive(liveSnap, state.matchedPaneHeader, expectedStep, state.body)) {
                   writeInReady = true;
                   break;
                 }
@@ -6237,7 +6324,7 @@ var PromptResponder = class {
           if (this.paneObserver) {
             try {
               const postHookSnap = await this.paneObserver.captureSnapshot();
-              if (!postHookSnap || !isWriteInInputActive(postHookSnap, state.matchedPaneHeader, expectedStep)) {
+              if (!postHookSnap || !isWriteInInputActive(postHookSnap, state.matchedPaneHeader, expectedStep, state.body)) {
                 return {
                   ok: false,
                   reason: "prompt-probe-failed",
@@ -6266,7 +6353,7 @@ var PromptResponder = class {
           if (this.paneObserver) {
             try {
               const preEnterSnap = await this.paneObserver.captureSnapshot();
-              if (!preEnterSnap || !isWriteInInputActive(preEnterSnap, state.matchedPaneHeader, expectedStep)) {
+              if (!preEnterSnap || !isWriteInInputActive(preEnterSnap, state.matchedPaneHeader, expectedStep, state.body)) {
                 return {
                   ok: false,
                   reason: "prompt-probe-failed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.99",
+  "version": "2.0.100",
   "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": {