@quantiya/codevibe-antigravity-plugin 2.0.85 → 2.0.87

package/README.md

@@ -45,7 +45,7 @@ install the unified `codevibe --agent` interface yet.
 - **macOS, Linux, or WSL Ubuntu** — Windows without WSL is not supported
 - **Node.js** 22.0.0+
 - **tmux** — `brew install tmux` on macOS, `apt install tmux` on Linux/WSL
-- **Antigravity CLI (`agy`)** — install from [Google's documentation](https://antigravity.google/docs)
+- **Antigravity CLI (`agy`) 1.4.3+** with `--log-file` advertised by `agy --help` — install from [Google's documentation](https://antigravity.google/docs). Companion checks this before creating a session and tells unsupported clients to update; direct `agy` is unchanged.
 
 > Antigravity CLI is distributed by Google as a binary; it is not on npm. After installing `agy`, run `codevibe --agent agy` and the plugin handles the rest.
 
@@ -66,7 +66,7 @@ All agy sessions on a computer write to the same folders. CodeVibe tells them ap
 
 On each launch, `codevibe --agent agy` registers one named entry, `codevibe-antigravity`, in `~/.gemini/config/hooks.json`, and keeps the hook scripts in `~/.codevibe/codevibe-agy/hooks/`:
 - Other entries in that file are left as they are.
-- A file that is not valid JSON, or is a symlink, is never changed. CodeVibe then falls back to agy's log files, which cannot tell concurrent sessions apart.
+- A file that is not valid JSON, or is a symlink, is never changed. Without hooks, CodeVibe uses only this launch's pinned native log and a `USER_INPUT`-first main transcript; unknown ownership waits, and `SYSTEM_MESSAGE`-first subagents are excluded.
 - For other agy sessions on the machine, `PreToolUse` immediately permits execution with `{"decision":"allow"}`, and other hook events are skipped.
 - To switch it off, add `"enabled": false` to the `codevibe-antigravity` entry. CodeVibe leaves a switched-off entry alone. Deleting the entry only lasts until the next `codevibe --agent agy` launch, which writes it again. After uninstalling CodeVibe you can delete the entry; see INSTALLATION.md.
 

package/antigravity-plugin.json

@@ -6,6 +6,6 @@
   "implementation": {
     "architecture": "transcript+tmux+approval-heuristic",
     "schema_version": "v1.0",
-    "note": "Monitors ~/.gemini/antigravity-cli/brain/<UUID>/.system_generated/logs/transcript.jsonl and the tmux pane. Where agy JSON hooks fire (agy 1.3.1+, hook gate on), the companion launcher registers a `codevibe-antigravity` entry in ~/.gemini/config/hooks.json (PreInvocation + PostToolUse) so each session routes only its own conversations; otherwise it falls back to agy's CLI log."
+    "note": "Requires native agy 1.4.3+ advertising --log-file; checked before Companion session creation. Monitors ~/.gemini/antigravity-cli/brain/<UUID>/.system_generated/logs/transcript.jsonl and the tmux pane. Own agy JSON hooks identify main conversations. Without hooks, ownership requires this launch's pinned native log and a USER_INPUT-first main transcript; SYSTEM_MESSAGE-first subagents and shared/newest logs are excluded. Unknown ownership defers sync."
   }
 }

package/dist/server.js

@@ -32,6 +32,7 @@ var server_exports = {};
 __export(server_exports, {
   ApprovalDetector: () => ApprovalDetector,
   McpServer: () => McpServer,
+  PromptResponder: () => PromptResponder,
   SessionNotFoundError: () => SessionNotFoundError,
   StoredAuthFailureError: () => StoredAuthFailureError,
   TERMINAL_SHUTDOWN_SIGNALS: () => TERMINAL_SHUTDOWN_SIGNALS,
@@ -789,6 +790,20 @@ var TranscriptTailer = class extends import_events.EventEmitter {
   getActiveConversations() {
     return Array.from(this.activeConversations);
   }
+  /** Retry a deferred native read after THIS launcher's hook proves ownership.
+   * No offset reset or legacy fallback. Join an in-flight read first so a late
+   * hook cannot lose its wakeup in that read's rejection/finally cleanup. */
+  retryOwnedConversation(conversationId) {
+    if (!this.admission || !this.isWatching || !CONVERSATION_DIR_REGEX.test(conversationId)) return;
+    const generation = this.readGeneration, filePath = this.transcriptPathFor(conversationId);
+    const pending = this.activeReads.get(filePath) ?? Promise.resolve();
+    void pending.then(() => {
+      if (!this.isWatching || generation !== this.readGeneration) return;
+      if (!fs2.existsSync(filePath)) return;
+      this.ensureOffset(filePath);
+      void this.scheduleReadNewLines(filePath, conversationId);
+    }).catch((error) => logger.warn("Owned transcript wakeup failed", { conversationId, error: String(error) }));
+  }
   // ─── follower event handlers ─────────────────────────────────────────────
   onFileAdded(filePath) {
     if (this.isShuttingDown) return;
@@ -1233,6 +1248,10 @@ var TranscriptTailer = class extends import_events.EventEmitter {
     }
     const generation = this.readGeneration;
     const read = this.drainReadQueue(filePath, conversationId, generation).catch((error) => {
+      if (error?.code === "SYNC_SOURCE_OWNERSHIP_PENDING") {
+        logger.debug("Transcript waiting for its own hook or process-bound log", { conversationId });
+        return;
+      }
       logger.error("Transcript read chain failed (non-fatal) \u2014 next change event retries", {
         filePath,
         conversationId,
@@ -2924,6 +2943,7 @@ function isComposerBoxAt(lines, idx) {
   }
   return false;
 }
+var ANSI_ESCAPE_REGEX = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
 function isPaneInputSafetyBlocked(input) {
   const rawText = Array.isArray(input) ? input.join("\n") : input;
   if (!rawText) return { blocked: false, kind: null };
@@ -3093,9 +3113,10 @@ function isPaneInputSafetyBlocked(input) {
   return { blocked: false, kind: null };
 }
 function looksLikePromptDelta(chunk) {
+  const text = chunk.includes("\x1B") ? chunk.replace(ANSI_ESCAPE_REGEX, "") : chunk;
   return (
     // Approval UI signatures
-    /Requesting permission for:/i.test(chunk) || /Do you want to proceed\?/i.test(chunk) || /\besc to cancel\b/i.test(chunk) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(chunk) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands))\S/im.test(chunk) || /Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:/i.test(chunk) || /\benter\s+(?:to\s+)?select\b/i.test(chunk) || /\b(?:navigate|use\s+arrow\s+keys)\b/i.test(chunk) || /^File access\s*$/im.test(chunk) || /^\s*Allow access to this file\?\s*$/im.test(chunk) || /(?:Yes, allow access|No, deny access)/i.test(chunk) || /(?:↑\/↓\s+Navigate|ctrl\+r\s+Review)/i.test(chunk) || /Our servers are experiencing/i.test(chunk) || /Error ID:\s*[0-9a-fA-F-]*/i.test(chunk) || /(?:⚠️|⚠\uFE0F?)\s+.*(?:high[- ]traffic|try again in a minute|try again later|stream was interrupted|stream interrupted|overloaded|unexpected error|quota\b|upgrade your subscription|increase your limits|resets in\s+\d|credits balance is too low|out of credits|rate[- ]limit|capacity exhausted|exhausted your quota|internal error|currently unreachable|network issue connecting|authentication expired|authentication issue|terminated due to error|invalid output|invalid tool call)/i.test(chunk)
+    /Requesting permission for:/i.test(chunk) || /Do you want to proceed\?/i.test(chunk) || /\besc to cancel\b/i.test(text) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(text) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands))\S/im.test(text) || /Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:/i.test(text) || /\benter\s+(?:to\s+)?(?:select|submit(?:\s+all)?|next)\b/i.test(text) || /\b(?:navigate|use\s+arrow\s+keys)\b/i.test(text) || /\b\d+[\/:of\s]+\d+:\s+\S/i.test(text) || /\bSubmit(?:\s+All)?\b/i.test(text) || /(?:^|[\s·|│])(?:←|<-)\s*Back\b/i.test(text) || /^File access\s*$/im.test(text) || /^\s*Allow access to this file\?\s*$/im.test(text) || /(?:Yes, allow access|No, deny access)/i.test(text) || /(?:↑\/↓\s+Navigate|ctrl\+r\s+Review)/i.test(text) || /Our servers are experiencing/i.test(text) || /Error ID:\s*[0-9a-fA-F-]*/i.test(text) || /(?:⚠️|⚠\uFE0F?)\s+.*(?:high[- ]traffic|try again in a minute|try again later|stream was interrupted|stream interrupted|overloaded|unexpected error|quota\b|upgrade your subscription|increase your limits|resets in\s+\d|credits balance is too low|out of credits|rate[- ]limit|capacity exhausted|exhausted your quota|internal error|currently unreachable|network issue connecting|authentication expired|authentication issue|terminated due to error|invalid output|invalid tool call)/i.test(text)
   );
 }
 function isNonSystemErrorWarningLine(trimmed) {
@@ -4216,7 +4237,7 @@ function isQuestionFooterLine(line) {
   }
   if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) return false;
   if (isQuestionHeaderLine(trimmed)) return false;
-  return /^(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?select)?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:enter|<enter>)\s+(?:to\s+)?select(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:enter|<enter>)?\s*(?:Select|to select))(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel))?$/i.test(trimmed) || /^press\s+<?(?:enter|return|space)>?\s+to\s+select$/i.test(trimmed) || /^space\s+to\s+select$/i.test(trimmed) || /^(?:\(?use\s+arrow\s+keys(?:\s+to\s+navigate)?\)?)$/i.test(trimmed) || /^(?:[\u2800-\u28FF]+(?:\s*waiting(?:\.\.\.)?)?|waiting(?:\.\.\.)?)$/i.test(trimmed);
+  return /^(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?)(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip|back))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:space|<space>)\s+(?:to\s+)?(?:select|toggle)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?))?(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip|back))?$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:(?:→|->)\s*Next|(?:←|<-)\s*Back))*(?:\s*[·│,]\s*(?:enter|<enter>)?\s*(?:Select|Submit(?:\s+All)?|to select))(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel|Back))?(?:\s*[·│,]\s*(?:(?:→|->)\s*Next|(?:←|<-)\s*Back))*(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel|Back))?$/i.test(trimmed) || /^(?:←|<-)\s*Back\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?)(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip))?$/i.test(trimmed) || /^press\s+<?(?:enter|return|space)>?\s+to\s+select$/i.test(trimmed) || /^space\s+to\s+select$/i.test(trimmed) || /^(?:\(?use\s+arrow\s+keys(?:\s+to\s+navigate)?\)?)$/i.test(trimmed) || /^(?:[\u2800-\u28FF]+(?:\s*waiting(?:\.\.\.)?)?|waiting(?:\.\.\.)?)$/i.test(trimmed);
 }
 function extractQuestionHeader(snapshot) {
   const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
@@ -4242,7 +4263,6 @@ function hashPromptSnapshot(snapshot) {
   }
   return (0, import_crypto.createHash)("sha256").update(normalized).digest("hex");
 }
-var ANSI_ESCAPE_REGEX = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
 function escapeShellArg(value) {
   return value.replace(/'/g, `'\\''`);
 }
@@ -4387,33 +4407,8 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
   const options = parseOptions(belowHeader);
   if (options.length < 2) return null;
   const normalizedHeader = header.fullLine.replace(/^[❯>\s*•-]+\s*/, "").trim();
-  const headerHasArrowHint = /\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)/i.test(normalizedHeader);
-  let footerHasArrowHint = false;
-  let footerHasCtrlRReview = false;
-  const startLine = headerIdx >= 0 ? headerIdx + 1 : 0;
-  let hasSeenOptions = false;
-  for (let i = startLine; i < lines.length; i++) {
-    if (lineInFence[i]) continue;
-    const trimmed = lines[i].trim();
-    if (!trimmed) continue;
-    if (hasSeenOptions && isResumedTurnSignal(trimmed)) break;
-    if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
-      hasSeenOptions = true;
-    }
-    const isFooter = isQuestionFooterLine(trimmed) || /^(?:ctrl\+[a-z0-9]+\s+[a-zA-Z]+|\(?use\s+arrow\s+keys(?:\s+to\s+navigate)?\)?)$/i.test(trimmed);
-    if (isFooter) {
-      if (/(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate\b/i.test(trimmed) || /\(?use\s+arrow\s+keys(?:\s+to\s+navigate)?\)?/i.test(trimmed)) {
-        footerHasArrowHint = true;
-      }
-      if (/ctrl\+r\s+Review\b/i.test(trimmed)) {
-        footerHasCtrlRReview = true;
-      }
-    }
-  }
-  const hasArrowKeyHint = headerHasArrowHint || footerHasArrowHint;
-  const hasWriteInOption = options.some((opt) => /^\s*write-?in\b/i.test(opt.text));
-  const hasCtrlRReviewFooter = footerHasCtrlRReview;
-  const isBaseNumberedWizard = /^Question\s+\d+\/\d+:/i.test(normalizedHeader) && !hasArrowKeyHint && !hasWriteInOption && !hasCtrlRReviewFooter;
+  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);
+  const isBaseNumberedWizard = /^Question\s+\d+\/\d+:/i.test(normalizedHeader) && !isMultiSelect;
   const submitMap = isBaseNumberedWizard ? buildQuestionSubmitMap(options) : {};
   const body = extractBodyBetweenHeaderAndFirstOption(belowHeader);
   return {
@@ -4476,12 +4471,47 @@ function buildApprovalSubmitMap(options) {
 function buildQuestionSubmitMap(options) {
   const map = {};
   for (const opt of options) {
-    if (!/^\s*write-?in\b/i.test(opt.text)) {
-      map[opt.number] = [opt.number, "Enter"];
-    }
+    map[opt.number] = [opt.number];
   }
   return map;
 }
+function isWriteInInputActive(paneText, expectedHeader, expectedStep) {
+  if (!paneText) return false;
+  if (detectActivePromptKind(paneText) !== "question") return false;
+  const stripped = paneText.replace(ANSI_ESCAPE_REGEX2, "");
+  const lines = stripped.trimEnd().split("\n");
+  const windowStart = Math.max(0, lines.length - 30);
+  let headerIdx = -1;
+  for (let i = lines.length - 1; i >= windowStart; i--) {
+    if (isQuestionHeaderLine(lines[i])) {
+      headerIdx = i;
+      break;
+    }
+  }
+  if (headerIdx < 0) return false;
+  const rawHeader = lines[headerIdx];
+  const extracted = extractQuestionHeader(rawHeader);
+  if (!extracted) return false;
+  if (expectedHeader) {
+    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) {
+      return false;
+    }
+  }
+  const expectedStepVal = expectedStep || (expectedHeader ? expectedHeader.match(/\bQuestion\s+(\d+(?:[\/:of\s]+\d+)?):/i)?.[1] : void 0);
+  if (expectedStepVal) {
+    const stepMatch = extracted.fullLine.match(/\bQuestion\s+(\d+(?:[\/:of\s]+\d+)?):/i);
+    const paneStep = stepMatch ? stepMatch[1] : null;
+    if (!paneStep || paneStep !== expectedStepVal) {
+      return false;
+    }
+  }
+  const searchLines = lines.slice(headerIdx);
+  const text = searchLines.join("\n");
+  return /Your answer:/i.test(text) && /enter\s+Submit(?:\s+All)?\s*[·│,]\s*esc\s+Back/i.test(text);
+}
 function extractIdentity(headerText) {
   if (!headerText) return {};
   const trimmed = headerText.trim();
@@ -5207,13 +5237,15 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           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());
           if (cOptTexts.length > 0 && qOptTexts.length > 0) {
-            const matchedQCount = qOptTexts.filter((q) => cOptTexts.includes(q)).length;
-            const matchedCCount = cOptTexts.filter((c) => qOptTexts.includes(c)).length;
+            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 matchedQCount = qOptTexts.filter((q) => cEffectiveTexts.includes(q)).length;
+            const matchedCCount = cEffectiveTexts.filter((c) => qOptTexts.includes(c)).length;
             const qRatio = matchedQCount / qOptTexts.length;
-            if (cOptTexts.length !== qOptTexts.length || matchedQCount !== qOptTexts.length || matchedCCount !== cOptTexts.length) {
+            if (cEffectiveTexts.length !== qOptTexts.length || matchedQCount !== qOptTexts.length || matchedCCount !== cEffectiveTexts.length) {
               return { score: -1, textMatch: true };
             }
-            const posMatches = qOptTexts.filter((q, idx) => idx < cOptTexts.length && cOptTexts[idx] === q).length;
+            const posMatches = qOptTexts.filter((q, idx) => idx < cEffectiveTexts.length && cEffectiveTexts[idx] === q).length;
             const posRatio = posMatches / qOptTexts.length;
             const score = qRatio * 0.5 + posRatio * 0.5;
             return { score, textMatch: true };
@@ -5246,13 +5278,19 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           });
           return null;
         }
+        const targetStepQ = sqs[bestStepIdx];
+        if (targetStepQ?.isMultiSelect) {
+          candidate.submitMap = {};
+        }
         const isAdvancement = bestStepIdx !== currentActiveIdx;
         if (!isAdvancement) {
           const existing = [...this.pendingPrompts.values()].find(
             (p) => p.conversationId === conversationId && p.kind === "question"
           );
           if (existing) {
-            const isInitialUpgrade = existing.isHookPrompt && Object.keys(existing.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
+            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) {
@@ -5271,12 +5309,30 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
               this.emit("prompt-upgraded", existing);
               return existing;
             }
-            if (!existing.paneSemanticKey) {
-              existing.paneSemanticKey = candidateSemanticKey;
+            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
+              });
+              this.resolvePrompt(existing.promptId, { advanceWizard: false });
+              this.emit("prompt-resolved", existing.promptId);
+            } else {
+              if (!existing.paneSemanticKey) {
+                existing.paneSemanticKey = candidateSemanticKey;
+              }
+              if (candidate.body) existing.body = candidate.body;
+              if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+              return null;
             }
-            if (candidate.body) existing.body = candidate.body;
-            if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
-            return null;
           }
         } else {
           liveWizard2.activeStepIndex = bestStepIdx;
@@ -5298,12 +5354,14 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
             const hookQuestionText = p.pendingCall?.questionText || p.matchedPaneHeader || p.paneDisplayHeader;
             const isSameQuestion = questionsMatch(hookQuestionText, paneQuestionText);
             if (isSameQuestion) {
-              const isInitialUpgrade = p.isHookPrompt && Object.keys(p.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
+              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 (p.isHookPrompt && Object.keys(p.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0) {
+                if (isInitialUpgrade) {
                   p.submitMap = candidate.submitMap;
                   if (candidate.options && candidate.options.length > 0) {
                     p.paneOptions = candidate.options;
@@ -5424,6 +5482,16 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
           } else {
             p.pendingCall = call;
           }
+          const isHookMultiSelect = Boolean(
+            call.isMultiSelect || call.structuredQuestions && call.structuredQuestions[0]?.isMultiSelect
+          );
+          if (isHookMultiSelect && Object.keys(p.submitMap || {}).length > 0) {
+            p.submitMap = {};
+            logger.info("emitHookQuestionPrompt: revoked actionable submitMap because incoming hook is multi-select", {
+              promptId: p.promptId
+            });
+            this.emit("prompt-upgraded", p);
+          }
           p.isHookPrompt = true;
           call.matchedPromptId = p.promptId;
           if (call.structuredQuestions && call.structuredQuestions.length > 0) {
@@ -5961,23 +6029,22 @@ var PromptResponder = class {
   }
   /**
    * Resolve a pending approval prompt with the mobile-user's chosen
-   * option number. Uses the submitMap from the PendingPromptState to
-   * translate option-number → terminal keystrokes (digit alone for agy's
-   * 4-numbered UI; future Y/N prompts would use 'y'/'n'/'Escape').
+   * option number and optional follow-up text for write-in questions.
+   * Uses the submitMap from the PendingPromptState to translate
+   * option-number → terminal keystrokes.
    *
    * Active-prompt-identity guard (DESIGN.md §3.4):
    *   1. Detector check: is `promptId` still in pendingPrompts? If not
    *      (expired or already-resolved), drop with `prompt-expired`.
-   *   2. Pane-observer check: probeApprovalUIActive() — does the pane
-   *      STILL show an approval UI whose header matches our pending
-   *      call's identity? If active-UI is gone OR header differs,
-   *      drop with `prompt-superseded`.
-   *   3. submitMap lookup: is `optionNumber` a valid key? If not (e.g.
-   *      mobile sent "5" for a 4-option prompt), drop with
-   *      `invalid-option`.
-   *   4. Send the keystrokes via tmux send-keys.
+   *   2. submitMap lookup: is `optionNumber` a valid key? If not, drop with `invalid-option`.
+   *      If `followUpText` is provided, verify option is Write-in; otherwise drop with `follow-up-not-allowed`.
+   *      If bare Write-in option has no text, drop with `write-in-text-required`.
+   *   3. Pane-observer check: captureSnapshot() — does the pane STILL show
+   *      an approval UI matching our pending prompt's semantic key?
+   *   4. Send option keystrokes via tmux send-keys.
+   *   5. If write-in followUpText is present: wait 250ms, verify pane state, type literal text, send Enter.
    */
-  async sendApprovalReply(promptId, optionNumber) {
+  async sendApprovalReply(promptId, optionNumber, followUpText, beforeTypeText) {
     const target = this.resolveTmuxTarget();
     if (!target) {
       return { ok: false, reason: "no-tmux-target" };
@@ -5992,15 +6059,6 @@ var PromptResponder = class {
           details: `promptId ${promptId} is not in pendingPrompts`
         };
       }
-      if (this.paneObserver) {
-        if (!state.paneSemanticKey) {
-          return {
-            ok: false,
-            reason: "prompt-probe-failed",
-            details: "pending prompt has no exact semantic identity"
-          };
-        }
-      }
       const keys = state.submitMap[optionNumber];
       if (!keys || keys.length === 0) {
         return {
@@ -6009,21 +6067,86 @@ var PromptResponder = class {
           details: `option '${optionNumber}' not in submitMap (valid: ${Object.keys(state.submitMap).join(",")})`
         };
       }
+      const isQuestionPrompt = state.kind === "question";
+      const 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;
+      if (isQuestionPrompt) {
+        if (state.paneOptions && state.paneOptions.length > 0 && !matchingOpt) {
+          return {
+            ok: false,
+            reason: "invalid-option",
+            details: `option '${optionNumber}' not found in advertised options`,
+            deliveryPhase: "none"
+          };
+        }
+        if (isWriteInOption && (!followUpText || followUpText.trim().length === 0)) {
+          return {
+            ok: false,
+            reason: "write-in-text-required",
+            details: 'Please provide your write-in text along with the option number (e.g. "4, your response")',
+            deliveryPhase: "none"
+          };
+        }
+        if (followUpText && followUpText.trim().length > 0 && !isWriteInOption) {
+          return {
+            ok: false,
+            reason: "follow-up-not-allowed",
+            details: `Option '${optionNumber}' does not accept follow-up text`,
+            deliveryPhase: "none"
+          };
+        }
+      }
+      if (this.paneObserver) {
+        if (!state.paneSemanticKey) {
+          return {
+            ok: false,
+            reason: "prompt-probe-failed",
+            details: "pending prompt has no exact semantic identity",
+            deliveryPhase: "none"
+          };
+        }
+      }
+      let deliveryPhase = "none";
       try {
         for (const key of keys) {
           if (!this.detector || !this.paneObserver) {
             return {
               ok: false,
               reason: "prompt-probe-failed",
-              details: "approval responder is missing its detector or pane observer"
+              details: "approval responder is missing its detector or pane observer",
+              deliveryPhase
             };
           }
-          if (this.detector.getPendingPrompt(promptId) !== state) {
-            return { ok: false, reason: "prompt-expired" };
+          const currentPrompt = this.detector.getPendingPrompt(promptId);
+          if (currentPrompt !== state || !currentPrompt.submitMap || !currentPrompt.submitMap[optionNumber]) {
+            return {
+              ok: false,
+              reason: "prompt-expired",
+              details: "option is no longer actionable on active prompt (controls revoked or updated)",
+              deliveryPhase
+            };
           }
           let liveSemanticKey = null;
           try {
             const snapshot = await this.paneObserver.captureSnapshot();
+            const 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
+              };
+            }
+            if (isQuestionPrompt && isWriteInInputActive(snapshot, state.matchedPaneHeader, expectedStep)) {
+              return {
+                ok: false,
+                reason: "write-in-already-active",
+                details: "write-in input field is already open on desktop; finish or cancel on desktop before selecting an option",
+                deliveryPhase: "none"
+              };
+            }
             const live = parseApprovalSnapshot(snapshot);
             if (!live) {
               if (detectActivePromptKind(snapshot) === null) {
@@ -6031,13 +6154,15 @@ var PromptResponder = class {
                 return {
                   ok: false,
                   reason: "prompt-superseded",
-                  details: "the approval chooser is no longer active"
+                  details: "the approval chooser is no longer active",
+                  deliveryPhase
                 };
               }
               return {
                 ok: false,
                 reason: "prompt-probe-failed",
-                details: "the active chooser could not be parsed exactly"
+                details: "the active chooser could not be parsed exactly",
+                deliveryPhase
               };
             }
             liveSemanticKey = live ? buildApprovalSemanticKey(live) : null;
@@ -6045,7 +6170,8 @@ var PromptResponder = class {
             return {
               ok: false,
               reason: "prompt-probe-failed",
-              details: error instanceof Error ? error.message : String(error)
+              details: error instanceof Error ? error.message : String(error),
+              deliveryPhase
             };
           }
           if (liveSemanticKey !== state.paneSemanticKey) {
@@ -6053,32 +6179,147 @@ var PromptResponder = class {
             return {
               ok: false,
               reason: "prompt-superseded",
-              details: "active chooser semantics differ from the mobile prompt"
+              details: "active chooser semantics differ from the mobile prompt",
+              deliveryPhase
             };
           }
+          deliveryPhase = "option_attempted";
           if (isNamedKey(key)) {
             await this.sendKey(target, key);
           } else {
             await this.typeLiteral(target, key);
           }
+          deliveryPhase = "option_sent";
+          await delay(50);
+        }
+        if (isQuestionPrompt && isWriteInOption && followUpText && followUpText.trim().length > 0) {
+          let writeInReady = false;
+          if (this.paneObserver) {
+            for (let probeAttempt = 0; probeAttempt < 10; probeAttempt++) {
+              await delay(100);
+              try {
+                const liveSnap = await this.paneObserver.captureSnapshot();
+                if (liveSnap && isWriteInInputActive(liveSnap, state.matchedPaneHeader, expectedStep)) {
+                  writeInReady = true;
+                  break;
+                }
+              } catch {
+              }
+            }
+            if (!writeInReady) {
+              return {
+                ok: false,
+                reason: "prompt-probe-failed",
+                details: "terminal pane failed to transition to write-in input line",
+                deliveryPhase
+              };
+            }
+          } else {
+            await delay(250);
+          }
+          if (beforeTypeText) {
+            try {
+              await beforeTypeText();
+            } catch (err) {
+              return {
+                ok: false,
+                reason: "tmux-failed",
+                details: err instanceof Error ? err.message : String(err),
+                deliveryPhase: "option_sent"
+                // Do not advance phase if hook throws (Claude R4-N2)
+              };
+            }
+          }
+          const postHookPrompt = this.detector.getPendingPrompt(promptId);
+          if (postHookPrompt !== state || !postHookPrompt.submitMap || !postHookPrompt.submitMap[optionNumber]) {
+            return { ok: false, reason: "prompt-expired", deliveryPhase: "option_sent" };
+          }
+          if (this.paneObserver) {
+            try {
+              const postHookSnap = await this.paneObserver.captureSnapshot();
+              if (!postHookSnap || !isWriteInInputActive(postHookSnap, state.matchedPaneHeader, expectedStep)) {
+                return {
+                  ok: false,
+                  reason: "prompt-probe-failed",
+                  details: "write-in input field disappeared during callback before typing",
+                  deliveryPhase: "option_sent"
+                };
+              }
+            } catch (err) {
+              return {
+                ok: false,
+                reason: "prompt-probe-failed",
+                details: err instanceof Error ? err.message : String(err),
+                deliveryPhase: "option_sent"
+              };
+            }
+            const postSnapPrompt1 = this.detector.getPendingPrompt(promptId);
+            if (postSnapPrompt1 !== state || !postSnapPrompt1.submitMap || !postSnapPrompt1.submitMap[optionNumber]) {
+              return { ok: false, reason: "prompt-expired", deliveryPhase: "option_sent" };
+            }
+          }
+          deliveryPhase = "text_attempted";
+          const cleanText = followUpText.replace(/[\r\n]+/g, " ").trim();
+          await this.typeLiteral(target, cleanText);
+          deliveryPhase = "text_typed";
+          await delay(50);
+          if (this.paneObserver) {
+            try {
+              const preEnterSnap = await this.paneObserver.captureSnapshot();
+              if (!preEnterSnap || !isWriteInInputActive(preEnterSnap, state.matchedPaneHeader, expectedStep)) {
+                return {
+                  ok: false,
+                  reason: "prompt-probe-failed",
+                  details: "write-in input field disappeared before confirmation",
+                  deliveryPhase: "text_typed"
+                };
+              }
+            } catch (err) {
+              return {
+                ok: false,
+                reason: "prompt-probe-failed",
+                details: err instanceof Error ? err.message : String(err),
+                deliveryPhase: "text_typed"
+              };
+            }
+          }
+          const postSnapPrompt = this.detector.getPendingPrompt(promptId);
+          if (postSnapPrompt !== state || !postSnapPrompt.submitMap || !postSnapPrompt.submitMap[optionNumber]) {
+            return { ok: false, reason: "prompt-expired", deliveryPhase: "text_typed" };
+          }
+          deliveryPhase = "enter_attempted";
+          await this.sendKey(target, "Enter");
+          deliveryPhase = "completed";
         }
         this.detector.resolvePrompt(promptId);
         logger.info("Sent approval reply via tmux", {
           promptId,
           optionNumber,
-          keysSent: keys
+          keysSent: keys,
+          hasFollowUpText: Boolean(followUpText),
+          deliveryPhase
         });
-        return { ok: true };
+        return { ok: true, deliveryPhase: "completed" };
       } catch (error) {
         return {
           ok: false,
           reason: "tmux-failed",
-          details: error instanceof Error ? error.message : String(error)
+          details: error instanceof Error ? error.message : String(error),
+          deliveryPhase
         };
       }
     }
     try {
       await this.typeLiteral(target, optionNumber);
+      await delay(50);
+      await this.sendKey(target, "Enter");
+      if (followUpText && followUpText.trim().length > 0) {
+        await delay(250);
+        const cleanText = followUpText.replace(/[\r\n]+/g, " ").trim();
+        await this.typeLiteral(target, cleanText);
+        await delay(50);
+        await this.sendKey(target, "Enter");
+      }
       return { ok: true };
     } catch (error) {
       return {
@@ -6795,6 +7036,7 @@ ${commandErrorText(error, "stdout")}`;
 }
 var McpServer = class _McpServer {
   constructor(options) {
+    this.lastNativeLogConversation = null;
     /** Per-session causal floor for transcript-event timestamps emitted right
      *  after a MOBILE prompt. The mobile USER_PROMPT is created by the iOS app
      *  (real ms clock) and never flows through prepareEventTimestamp, while the
@@ -6987,6 +7229,15 @@ var McpServer = class _McpServer {
     this.tmuxTarget = options.tmuxTarget ?? process.env.CODEVIBE_AGY_TMUX_TARGET ?? null;
     this.wrapperPid = options.wrapperPid ?? null;
     this.cliLogPath = options.cliLogPath ?? null;
+    this.nativeCliLogPath = options.nativeCliLogPath ?? null;
+    this.nativeCliLogIdentity = null;
+    if (this.nativeCliLogPath) {
+      const st = fs7.lstatSync(this.nativeCliLogPath);
+      if (!st.isFile() || st.isSymbolicLink() || st.nlink !== 1 || st.uid !== process.getuid?.()) {
+        throw Error("AGY_NATIVE_LOG_NOT_OWNED");
+      }
+      this.nativeCliLogIdentity = { dev: st.dev, ino: st.ino };
+    }
     this.launchSettleTimeoutMs = options.launchSettleTimeoutMs ?? LAUNCH_SETTLE_TIMEOUT_MS;
     this.appSyncClient = options.appSyncClient ?? new import_codevibe_core7.AppSyncClient();
     this.toolActivity = options.toolActivityIntegration === void 0 ? new AgyToolActivityIntegration({
@@ -7614,13 +7865,14 @@ var McpServer = class _McpServer {
     }
   }
   /**
-   * The pre-F1 rule, now only the fallback for conversations no hook has
-   * claimed when hooks do not fire (see conversation-router.ts): the newest
-   * agy CLI log names the active conversation. F1 amendment: a conversation
-   * another live CodeVibe daemon has claimed is never "the active one" here,
-   * so another session's busy log cannot make us drop our own turn.
+   * Production launchers supply a pinned native log. Hookless routing admits
+   * only its positively identified main transcript. The unbound pre-F1 rule
+   * below remains for legacy/test callers, not durable source allocation.
    */
   legacyAcceptsConversation(conversationId) {
+    if (this.nativeCliLogPath) {
+      return !this.claims.isClaimedElsewhere(conversationId) && this.boundNativeLogConversation() === conversationId;
+    }
     if (process.env.JEST_WORKER_ID && !this.cliLogPath) {
       return true;
     }
@@ -7634,6 +7886,38 @@ var McpServer = class _McpServer {
     }
     return activeId === conversationId;
   }
+  /** Never resolve the shared cli.log symlink or scan for another process's log. */
+  boundNativeLogConversation() {
+    if (!this.nativeCliLogPath || !this.nativeCliLogIdentity) return null;
+    let fd;
+    try {
+      fd = fs7.openSync(this.nativeCliLogPath, fs7.constants.O_RDONLY | fs7.constants.O_NOFOLLOW);
+      const st = fs7.fstatSync(fd), expected = this.nativeCliLogIdentity;
+      if (!st.isFile() || st.nlink !== 1 || st.dev !== expected.dev || st.ino !== expected.ino) return null;
+      const matches = [...fs7.readFileSync(fd, "utf8").matchAll(/(?:Created conversation|Streaming conversation|Starting conversation update stream for)\s+([0-9a-fA-F-]{36})/g)];
+      const checked = /* @__PURE__ */ new Set();
+      for (let i = matches.length - 1; i >= 0; i--) {
+        const conversationId = matches[i][1];
+        if (checked.has(conversationId)) continue;
+        checked.add(conversationId);
+        if (this.router.roleOf(conversationId) !== "subagent" && !this.claims.isClaimedElsewhere(conversationId) && this.readConversationFirstType(conversationId) === "USER_INPUT") return conversationId;
+      }
+      return null;
+    } catch {
+      return null;
+    } finally {
+      if (fd !== void 0) fs7.closeSync(fd);
+    }
+  }
+  refreshNativeLogOwnership() {
+    const conversationId = this.boundNativeLogConversation();
+    if (!conversationId || conversationId === this.lastNativeLogConversation) return;
+    this.lastNativeLogConversation = conversationId;
+    if (this.router.roleOf(conversationId) !== "subagent" && !this.claims.isClaimedElsewhere(conversationId)) {
+      logger.info("Agy launch log identified its native conversation", { conversationId, ownership: "process-bound-log" });
+      this.transcriptTailer.retryOwnedConversation(conversationId);
+    }
+  }
   /**
    * F1 moved the runtime dir under ~/.codevibe, so it outlives reboots. The
    * wrapper's EXIT trap removes it, except when the outer terminal closed while
@@ -7644,6 +7928,12 @@ var McpServer = class _McpServer {
   removeOrphanedRuntimeDir() {
     if (!this.runtimeDir || this.wrapperPid === null || isPidAlive(this.wrapperPid)) return;
     try {
+      if (this.nativeCliLogPath && this.nativeCliLogIdentity) {
+        const st = fs7.lstatSync(this.nativeCliLogPath);
+        if (st.isFile() && !st.isSymbolicLink() && st.nlink === 1 && st.dev === this.nativeCliLogIdentity.dev && st.ino === this.nativeCliLogIdentity.ino) {
+          fs7.unlinkSync(this.nativeCliLogPath);
+        }
+      }
       fs7.rmdirSync(this.runtimeDir);
       logger.info("Removed runtime dir left by a closed terminal", { runtimeDir: this.runtimeDir });
     } catch (error) {
@@ -7715,6 +8005,7 @@ var McpServer = class _McpServer {
       });
       if (role === "main") {
         this.observedMainConversationIds.add(conversationId);
+        this.transcriptTailer.retryOwnedConversation(conversationId);
         if (!wasAlreadyAdmitted) {
           await this.drainHeldHookDeliveries(conversationId, "process", delivery.initialNumSteps);
         }
@@ -7763,6 +8054,7 @@ var McpServer = class _McpServer {
       logger.warn("PostToolUse prompt resolution failed", { error: String(error) });
     });
     this.router.onPostToolUse(conversationId);
+    if (this.router.roleOf(conversationId) === "main") this.transcriptTailer.retryOwnedConversation(conversationId);
   }
   resolveLingeringQuestionPrompts(conversationId) {
     const lingeringPrompts = this.approvalDetector.getPendingPromptsForConversation(conversationId).filter((p) => p.kind === "question");
@@ -8188,8 +8480,9 @@ var McpServer = class _McpServer {
     const selection = await this.selectNativeSource(session);
     if (!this.started || this.session !== session) throw Error("SYNC_SOURCE_OWNER_CHANGED");
     if (selection.protocol === "LEGACY") return null;
-    if (!this.legacyAcceptsConversation(source.conversationId) || this.router.roleOf(source.conversationId) === "subagent") {
-      throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    const ownsConversation = () => !this.claims.isClaimedElsewhere(source.conversationId) && (this.router.roleOf(source.conversationId) === "main" || this.router.roleOf(source.conversationId) === void 0 && this.boundNativeLogConversation() === source.conversationId);
+    if (!ownsConversation()) {
+      throw Object.assign(Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE"), { code: "SYNC_SOURCE_OWNERSHIP_PENDING" });
     }
     if (!this.toolActivity?.isActive(session.sessionId)) {
       if (this.nativeToolStart && this.nativeToolStart.session !== session) throw Error("SYNC_SOURCE_OWNER_CHANGED");
@@ -8203,7 +8496,12 @@ var McpServer = class _McpServer {
       }
       await this.nativeToolStart.pending;
     }
-    if (!this.toolActivity?.isActive(session.sessionId) || this.session !== session || !this.started) throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    if (!ownsConversation()) {
+      throw Object.assign(Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE"), { code: "SYNC_SOURCE_OWNERSHIP_PENDING" });
+    }
+    if (!this.toolActivity?.isActive(session.sessionId) || this.session !== session || !this.started) {
+      throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    }
     const streamSha256 = crypto3.createHash("sha256").update(JSON.stringify([source.filePath, source.conversationId])).digest("hex");
     const key = `${selection.sessionScope.sessionId}:${selection.sessionScope.sessionGenerationId}:${streamSha256}`;
     const existing = this.nativeSources.get(key);
@@ -8247,7 +8545,7 @@ var McpServer = class _McpServer {
       this.assertNativeOwner(owner);
       if ((await owner.cursor.open(0)).byteOffset >= source.endOffset) return;
       const admission = { outputs: [null, null] };
-      await this.handleTranscriptEmit(emit, "legacy", admission);
+      await this.handleTranscriptEmit(emit, "process", admission);
       this.assertNativeOwner(owner);
       const echoFrame = {
         streamSha256: owner.streamSha256,
@@ -9060,7 +9358,7 @@ var McpServer = class _McpServer {
     if (bound && this.observedMainConversationIds.has(bound)) return bound;
     if (this.observedMainConversationIds.size === 0) return null;
     const cliLogPath = this.cliLogPath ?? path8.join(os7.homedir(), ".gemini", "antigravity-cli", "cli.log");
-    const cliActive = getActiveConversationFromCliLog(cliLogPath);
+    const cliActive = this.nativeCliLogPath ? this.boundNativeLogConversation() : getActiveConversationFromCliLog(cliLogPath);
     if (cliActive && this.observedMainConversationIds.has(cliActive)) {
       return cliActive;
     }
@@ -9086,9 +9384,7 @@ var McpServer = class _McpServer {
     let e1rec;
     if (e1existing) {
       e1rec = e1existing.record;
-      if (!isDisplayOnly && !e1rec.mobileActionable) {
-        e1rec.mobileActionable = true;
-      }
+      e1rec.mobileActionable = !isDisplayOnly;
     } else {
       e1rec = this.newE1Raise(session.sessionId, !isDisplayOnly);
       const oldPromptId = state.promptId;
@@ -9372,22 +9668,119 @@ var McpServer = class _McpServer {
           }
         }
         await this.trackDurableMobileEcho(session, evt, intent.option, "primary");
-        const optionResult = await this.promptResponder.sendApprovalReply(
-          activePrompt.promptId,
-          intent.option
-        );
-        if (!optionResult.ok) {
-          if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) this.mobileDeduper.forget(session.sessionId, intent.option);
+        const isQuestionPrompt = activePrompt.kind === "question";
+        if (isQuestionPrompt) {
+          let armedWriteInEcho = false;
+          const optionResult = intent.followUpText ? await this.promptResponder.sendApprovalReply(
+            activePrompt.promptId,
+            intent.option,
+            intent.followUpText,
+            async () => {
+              armedWriteInEcho = true;
+              await this.trackDurableMobileEcho(session, evt, intent.followUpText, "free_form");
+            }
+          ) : await this.promptResponder.sendApprovalReply(
+            activePrompt.promptId,
+            intent.option
+          );
+          if (!optionResult.ok) {
+            if (optionResult.reason === "write-in-text-required") {
+              await this.emitPromptSafetyNotification(
+                session,
+                optionResult.details || 'Please provide your write-in text along with the option number (e.g. "4, your response").'
+              );
+            } else if (optionResult.reason === "write-in-already-active") {
+              await this.emitPromptSafetyNotification(
+                session,
+                optionResult.details || "Write-in input field is already open on desktop; finish or cancel on desktop before selecting an option."
+              );
+            } else if (optionResult.reason === "follow-up-not-allowed") {
+              await this.emitPromptSafetyNotification(
+                session,
+                optionResult.details || `Option ${intent.option} does not accept follow-up text.`
+              );
+            } else {
+              const phase = optionResult.deliveryPhase ?? "none";
+              let message;
+              if (phase !== "none") {
+                message = "Your answer was partially entered on desktop. Please complete or cancel the prompt directly on desktop.";
+              } 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.";
+              } 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") {
+                message = "This question requires desktop input. Please respond directly on desktop.";
+              } else if (optionResult.reason === "invalid-option") {
+                message = optionResult.details || `Option '${intent.option}' is not valid for the current question.`;
+              } else {
+                message = optionResult.details || `Failed to submit response to question prompt (${optionResult.reason}).`;
+              }
+              await this.emitPromptSafetyNotification(session, message);
+            }
+            if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) {
+              const phase = optionResult.deliveryPhase ?? "none";
+              if (phase === "none") {
+                this.mobileDeduper.forget(session.sessionId, intent.option);
+                if (armedWriteInEcho && intent.followUpText) {
+                  this.mobileDeduper.forget(session.sessionId, intent.followUpText);
+                }
+              } else if (phase === "option_sent" && armedWriteInEcho && intent.followUpText) {
+                this.mobileDeduper.forget(session.sessionId, intent.followUpText);
+              }
+            }
+            return;
+          }
+          await this.resolveE1PluginApproval(session.sessionId, activePrompt.promptId);
+          await this.markExecuted(evt);
           return;
-        }
-        await this.resolveE1PluginApproval(session.sessionId, activePrompt.promptId);
-        if (!intent.followUpText) {
+        } else {
+          const optionResult = await this.promptResponder.sendApprovalReply(
+            activePrompt.promptId,
+            intent.option
+          );
+          if (!optionResult.ok) {
+            if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) {
+              const phase = optionResult.deliveryPhase ?? "none";
+              if (phase === "none") {
+                this.mobileDeduper.forget(session.sessionId, intent.option);
+              }
+            }
+            return;
+          }
+          await this.resolveE1PluginApproval(session.sessionId, activePrompt.promptId);
+          if (intent.followUpText) {
+            await new Promise((r) => setTimeout(r, 250));
+            const freeFormResult = await this.promptResponder.sendFreeFormWhenNoApprovalActive(
+              intent.followUpText,
+              () => this.trackDurableMobileEcho(session, evt, intent.followUpText, "free_form")
+            );
+            if (!freeFormResult.ok) {
+              if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) {
+                this.mobileDeduper.forget(session.sessionId, intent.followUpText);
+              }
+              logger.warn("Follow-up text send failed for approval", { reason: freeFormResult.reason });
+              return;
+            }
+          }
           await this.markExecuted(evt);
           return;
         }
-        promptContent = intent.followUpText;
-        await new Promise((resolve2) => setTimeout(resolve2, 250));
       } else {
+        const activeQuestionPrompt = pendingPrompts.find((p) => p.kind === "question");
+        if (activeQuestionPrompt) {
+          const isDisplayOnly = Object.keys(activeQuestionPrompt.submitMap || {}).length === 0;
+          logger.warn("Non-option input received while an interactive question prompt is active; rejecting dismissal", {
+            sessionId: session.sessionId,
+            promptId: activeQuestionPrompt.promptId,
+            isDisplayOnly,
+            content: promptContent.slice(0, 64)
+          });
+          const message = isDisplayOnly ? "The active terminal question prompt is display-only on mobile. Please select an option directly in your terminal." : "An interactive question prompt is active in your terminal. Please select one of the advertised options or answer directly in your terminal.";
+          await this.emitPromptSafetyNotification(session, message);
+          return;
+        }
         const hasDisplayOnlyPrompt = pendingPrompts.some(
           (p) => Object.keys(p.submitMap || {}).length === 0
         );
@@ -9596,6 +9989,7 @@ var McpServer = class _McpServer {
       const state = await this.tmuxSessionState(tmuxTarget);
       if (state === "alive") {
         this.tmuxLifecycleObservedAlive = true;
+        this.refreshNativeLogOwnership();
         return;
       }
       const ownershipEstablished = this.tmuxLifecycleObservedAlive || Date.now() >= this.tmuxLifecycleInitDeadlineMs;
@@ -9923,6 +10317,7 @@ async function main() {
     bearerToken,
     preferredPort: args.port,
     runtimeDir: args.runtimeDir,
+    nativeCliLogPath: args.runtimeDir ? path8.join(args.runtimeDir, "native-cli.log") : void 0,
     tmuxTarget: process.env.CODEVIBE_AGY_TMUX_TARGET ?? void 0,
     wrapperPid: process.env.CODEVIBE_AGY_WRAPPER_PID ? parseInt(process.env.CODEVIBE_AGY_WRAPPER_PID, 10) : void 0
   });
@@ -10057,6 +10452,7 @@ var __testing = {
 0 && (module.exports = {
   ApprovalDetector,
   McpServer,
+  PromptResponder,
   SessionNotFoundError,
   StoredAuthFailureError,
   TERMINAL_SHUTDOWN_SIGNALS,

package/libexec/companion-launcher

@@ -50,6 +50,7 @@
 # Companion limitations:
 #   - Requires tmux. Print mode (`--print` / `-p`) is NOT supported.
 #   - Requires Node.js 22 or newer for the MCP server.
+#   - Requires agy 1.4.3+ advertising --log-file for launch ownership.
 #
 
 set -e
@@ -182,6 +183,37 @@ case "${1:-}" in
         ;;
 esac
 
+# Companion owns the log used as native transcript ownership proof. Do not
+# silently override a user's log or let a second flag redirect that proof.
+for _CV_ARG in "$@"; do
+    case "$_CV_ARG" in
+        --log-file|--log-file=*|-log-file|-log-file=*)
+            echo 'Error: CodeVibe Companion owns --log-file for session isolation. Run agy directly to use a custom log.' >&2
+            exit 2
+            ;;
+    esac
+done
+unset _CV_ARG
+
+# Require the tested native contract before installer, runtime, or session work.
+# Metadata passthrough above and direct `agy` use remain unchanged.
+require_native_sync_support() {
+    local version="$1" binary="$2" help major minor patch
+    if [[ "$version" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+        major=$((10#${BASH_REMATCH[1]}))
+        minor=$((10#${BASH_REMATCH[2]}))
+        patch=$((10#${BASH_REMATCH[3]}))
+        if (( major > 1 || (major == 1 && (minor > 4 || (minor == 4 && patch >= 3))) )); then
+            if help="$("$binary" --help 2>&1)" &&
+                [[ "$help" =~ (^|[[:space:]])--log-file([=[:space:]]|$) ]]; then
+                return 0
+            fi
+        fi
+    fi
+    echo 'Error: CodeVibe Companion requires Antigravity CLI 1.4.3+ with --log-file support. Update agy, then retry. Direct agy use is unchanged.' >&2
+    return 1
+}
+
 # ─── Environment probes ───────────────────────────────────────────────
 _CV_NODE_VER="missing"
 command -v node >/dev/null 2>&1 && _CV_NODE_VER="$(node -v 2>/dev/null | cv_sanitize)"
@@ -191,7 +223,7 @@ command -v tmux >/dev/null 2>&1 && _CV_TMUX_VER="$(tmux -V 2>/dev/null | cv_sani
 [ -z "$_CV_TMUX_VER" ] && _CV_TMUX_VER="unknown"
 _CV_AGY_BIN="$(resolve_agy_bin)"
 _CV_AGY_VER="missing"
-[ -n "$_CV_AGY_BIN" ] && _CV_AGY_VER="$("$_CV_AGY_BIN" --version 2>/dev/null | cv_sanitize)"
+[ -n "$_CV_AGY_BIN" ] && _CV_AGY_VER="$(cv_sanitize "$("$_CV_AGY_BIN" --version 2>/dev/null)")"
 [ -z "$_CV_AGY_VER" ] && _CV_AGY_VER="unknown"
 _CV_OS_VER="$(uname -s | cv_sanitize)"
 [ -z "$_CV_OS_VER" ] && _CV_OS_VER="unknown"
@@ -262,6 +294,11 @@ if [ -z "$_CV_AGY_BIN" ] || ! [ -f "$_CV_AGY_BIN" ] || ! [ -x "$_CV_AGY_BIN" ];
     exit 1
 fi
 
+if ! require_native_sync_support "$_CV_AGY_VER" "$_CV_AGY_BIN"; then
+    cv_failed "agy_sync_contract_unsupported"
+    exit 2
+fi
+
 if ! command -v node &> /dev/null; then
     echo "Error: Node.js is required but not installed."
     echo "Install Node.js 22+ from: https://nodejs.org"
@@ -348,6 +385,14 @@ rm -f "$RUNTIME_DIR/conn.json" "$RUNTIME_DIR/claims.json"
 # Also tighten the runtime base — best-effort, no fatal on failure.
 chmod 0700 "$RUNTIME_BASE" 2>/dev/null || true
 
+# The native process and daemon share only this launch's fresh regular log.
+# Refuse a stale PID-reuse file rather than trusting its conversation identity.
+NATIVE_CLI_LOG="$RUNTIME_DIR/native-cli.log"
+if ! (umask 077; set -o noclobber; : > "$NATIVE_CLI_LOG"); then
+    echo 'Error: this Companion runtime already contains a native log; refusing ambiguous ownership.' >&2
+    exit 1
+fi
+
 log "Wrapper PID=$WRAPPER_PID; token=$(printf '%s' "$BEARER_TOKEN" | cut -c1-8)...; port=$MCP_PORT; runtime=$RUNTIME_DIR"
 
 # Export env vars consumed by the MCP server + any in-tree tooling.
@@ -481,7 +526,8 @@ escaped_exit_file="$(escape_sq "$_CV_AGY_EXIT_FILE")"
 escaped_conn_file="$(escape_sq "$RUNTIME_DIR/conn.json")"
 escaped_mcp_log="$(escape_sq "$MCP_LOG_FILE")"
 escaped_node_bin="$(escape_sq "$(command -v node)")"
-AGY_CMD="'$escaped_bin'"
+escaped_native_log="$(escape_sq "$NATIVE_CLI_LOG")"
+AGY_CMD="'$escaped_bin' --log-file '$escaped_native_log'"
 for arg in "$@"; do
     escaped_arg="$(escape_sq "$arg")"
     AGY_CMD="$AGY_CMD '$escaped_arg'"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.85",
+  "version": "2.0.87",
   "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": {
@@ -46,7 +46,7 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@quantiya/codevibe-core": "^2.0.75",
+    "@quantiya/codevibe-core": "^2.0.76",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",