@quantiya/codevibe-antigravity-plugin 2.0.80 → 2.0.82

package/dist/agy-hook.js

@@ -97,7 +97,9 @@ function buildBody(raw) {
       const kept = {};
       for (const key of FORWARDED_TOOL_ARG_KEYS) {
         const value = source[key];
-        if (typeof value === "string") kept[key] = value.slice(0, MAX_TOOL_ARG_CHARS);
+        if (typeof value === "string") {
+          kept[key] = value.slice(0, MAX_TOOL_ARG_CHARS);
+        }
       }
       body.toolArgs = kept;
     }
@@ -230,8 +232,9 @@ function finishProcess() {
   process.exit(0);
 }
 if (require.main === module) {
-  setTimeout(finishProcess, HARD_DEADLINE_MS);
-  runHook({ event: process.argv[2], env: process.env, stdin: process.stdin }).then(finishProcess, finishProcess);
+  const exitHandler = () => finishProcess();
+  setTimeout(exitHandler, HARD_DEADLINE_MS);
+  runHook({ event: process.argv[2], env: process.env, stdin: process.stdin }).then(exitHandler, exitHandler);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/server.ts
 var server_exports = {};
 __export(server_exports, {
+  ApprovalDetector: () => ApprovalDetector,
   McpServer: () => McpServer,
   SessionNotFoundError: () => SessionNotFoundError,
   StoredAuthFailureError: () => StoredAuthFailureError,
@@ -47,13 +48,15 @@ __export(server_exports, {
   isAgyStatusFooterLine: () => isAgyStatusFooterLine,
   isComposedStatusFooter: () => isComposedStatusFooter,
   isPaneInputSafetyBlocked: () => isPaneInputSafetyBlocked,
+  isQuestionFooterLine: () => isQuestionFooterLine,
   isSystemErrorActiveFromIndex: () => isSystemErrorActiveFromIndex,
   looksLikePromptSnapshot: () => looksLikePromptSnapshot,
   parseApprovalSnapshot: () => parseApprovalSnapshot,
   parseMaybeJson: () => parseMaybeJson,
   readTranscriptFirstType: () => readTranscriptFirstType,
   reconstructFooter: () => reconstructFooter,
-  runForeignSpawnIdle: () => runForeignSpawnIdle
+  runForeignSpawnIdle: () => runForeignSpawnIdle,
+  safeIsoTimestamp: () => safeIsoTimestamp
 });
 module.exports = __toCommonJS(server_exports);
 var crypto3 = __toESM(require("crypto"));
@@ -4586,23 +4589,31 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       return null;
     }
     const promptId = forcedPromptId ?? (0, import_uuid.v4)();
+    const matchingCall = candidate.kind === "question" ? this.findMatchingPendingCall(candidate, conversationId) : null;
+    if (matchingCall) {
+      matchingCall.matchedPromptId = promptId;
+    }
     const syntheticCall = {
       conversationId,
-      intentStepIndex: -1,
+      intentStepIndex: matchingCall?.intentStepIndex ?? -1,
       // sentinel: "no transcript origin"
-      toolCallIndex: 0,
-      intentByteOffset: 0,
+      toolCallIndex: matchingCall?.toolCallIndex ?? 0,
+      intentByteOffset: matchingCall?.intentByteOffset ?? 0,
       // Best-effort tool-type inference from the candidate. For shell
       // commands → RUN_COMMAND. For edit-style headers with a file
       // path → CODE_ACTION. For questions → ASK_QUESTION. Default: GENERIC.
-      toolType: guessToolTypeFromIdentity(candidate),
-      command: candidate.command,
-      filePath: candidate.filePath,
-      rawToolName: candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown",
-      questionText: candidate.kind === "question" ? candidate.headerText : void 0,
+      toolType: matchingCall?.toolType ?? guessToolTypeFromIdentity(candidate),
+      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,
+      // 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,
       promptId,
-      startedAt: Date.now(),
-      intentCreatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      startedAt: matchingCall?.startedAt ?? Date.now(),
+      intentCreatedAt: matchingCall?.intentCreatedAt ?? (/* @__PURE__ */ new Date()).toISOString()
     };
     const state = {
       promptId,
@@ -4896,6 +4907,11 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     if (state.pendingCall.promptId === promptId) {
       state.pendingCall.promptId = void 0;
     }
+    for (const call of this.pendingCalls.values()) {
+      if (call.matchedPromptId === promptId) {
+        call.matchedPromptId = void 0;
+      }
+    }
     this.paneOnlyEmittedHashes.clear();
     return state;
   }
@@ -4922,7 +4938,11 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
   }
   findMatchingPendingCall(candidate, conversationId) {
     if (candidate.kind === "question") {
-      const questionCalls = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter(
+      const questionCalls = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.resultStepIndex === void 0).filter((c) => {
+        const associatedPromptId = c.matchedPromptId || c.promptId;
+        if (!associatedPromptId) return true;
+        return !this.resolvedPrompts.has(associatedPromptId) && !this.pendingPrompts.has(associatedPromptId);
+      }).filter(
         (c) => c.toolType === "ASK_QUESTION" || c.rawToolName?.toLowerCase() === "ask_question"
       ).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
       if (questionCalls.length > 0 && candidate.headerText) {
@@ -5642,6 +5662,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
           command: extractCommandFromArgs(name, args),
           filePath: extractFilePathFromArgs(name, args),
           questionText: extractQuestionFromArgs(name, args),
+          questionOptions: extractQuestionOptionsFromArgs(name, args),
           cwd: extractCwdFromArgs(args),
           rawToolName: name,
           startedAt: Date.now(),
@@ -5793,8 +5814,15 @@ function extractQuestionFromArgs(toolName, args) {
   if (typeof a.prompt === "string" && a.prompt.trim().length > 0) {
     return stripWrappingQuotes2(a.prompt.trim());
   }
-  if (Array.isArray(a.questions) && a.questions.length > 0) {
-    const first = a.questions[0];
+  let questions = a.questions;
+  if (typeof questions === "string") {
+    try {
+      questions = JSON.parse(questions.trim());
+    } catch {
+    }
+  }
+  if (Array.isArray(questions) && questions.length > 0) {
+    const first = questions[0];
     if (typeof first === "string" && first.trim().length > 0) {
       return stripWrappingQuotes2(first.trim());
     }
@@ -5807,6 +5835,40 @@ function extractQuestionFromArgs(toolName, args) {
   }
   return void 0;
 }
+function extractQuestionOptionsFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const tn = (toolName || "").toLowerCase().trim();
+  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
+  if (!isQuestionTool) return void 0;
+  const a = args;
+  let questions = a.questions;
+  if (typeof questions === "string") {
+    try {
+      questions = JSON.parse(questions.trim());
+    } catch {
+    }
+  }
+  if (Array.isArray(questions) && questions.length > 0) {
+    const first = questions[0];
+    if (first && typeof first === "object" && Array.isArray(first.options)) {
+      const rawOptions = first.options;
+      const result = [];
+      for (let i = 0; i < rawOptions.length; i++) {
+        const opt = rawOptions[i];
+        if (typeof opt === "string" && opt.trim().length > 0) {
+          result.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
+        } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
+          result.push({
+            number: String(opt.number ?? i + 1),
+            text: stripWrappingQuotes2(String(opt.text).trim())
+          });
+        }
+      }
+      if (result.length > 0) return result;
+    }
+  }
+  return void 0;
+}
 function extractCwdFromArgs(args) {
   if (!args || typeof args !== "object") return void 0;
   const a = args;
@@ -5912,6 +5974,15 @@ function friendlyHookToolName(rawName, resultType) {
       return transcriptTypeToFriendlyToolName(resultType);
   }
 }
+function safeIsoTimestamp(rawTimestamp) {
+  if (typeof rawTimestamp === "string" && rawTimestamp.trim().length > 0) {
+    const parsed = Date.parse(rawTimestamp);
+    if (!Number.isNaN(parsed)) {
+      return new Date(parsed).toISOString();
+    }
+  }
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
 function commandTarget(command) {
   return command?.trim().split(/\s+/)[0] || void 0;
 }
@@ -5998,7 +6069,7 @@ var AgyToolActivityIntegration = class {
       id: agyOccurrenceId(emit, matchedCall),
       tool: friendlyHookToolName(matchedCall?.rawToolName, resultType),
       ...target ? { normalizedTarget: target } : {},
-      ts: emit.event.created_at,
+      ts: safeIsoTimestamp(emit.event.created_at),
       byteOffset: emit.byteOffset,
       ...inputIdentity ? { digest: (0, import_codevibe_core6.digestOf)(inputIdentity) } : {}
     });
@@ -8153,7 +8224,8 @@ var McpServer = class _McpServer {
     const e1existing = this.e1PromptRaises.get(state.promptId);
     const e1rec = e1existing ? e1existing.record : this.newE1Raise(session.sessionId, !isDisplayOnly);
     if (!e1existing) state.promptId = e1rec.promptId;
-    const optionsArr = isDisplayOnly ? [] : state.paneOptions ? state.paneOptions.map((o) => ({ number: o.number, text: o.text })) : Object.keys(state.submitMap).map((n) => ({ number: n }));
+    const resolvedOptions = state.paneOptions && state.paneOptions.length > 0 ? state.paneOptions : state.pendingCall?.questionOptions && state.pendingCall.questionOptions.length > 0 ? state.pendingCall.questionOptions : void 0;
+    const optionsArr = isDisplayOnly ? [] : resolvedOptions ? resolvedOptions.map((o) => ({ number: o.number, text: o.text })) : Object.keys(state.submitMap).map((n) => ({ number: n }));
     const diffParsed = parseFencedDiffFromBody(
       state.body,
       state.paneDisplayHeader
@@ -8183,7 +8255,14 @@ var McpServer = class _McpServer {
       command: state.pendingCall.command,
       file_path: filePath,
       options: optionsArr,
-      ...toolInput ? { tool_input: toolInput } : {}
+      ...toolInput ? { tool_input: toolInput } : {},
+      ...state.kind === "question" && resolvedOptions && resolvedOptions.length > 0 ? {
+        questions: [{
+          question: state.pendingCall?.questionText || state.matchedPaneHeader || state.paneDisplayHeader || "Question",
+          options: resolvedOptions,
+          ...isDisplayOnly ? { instructions: "Answer this question in your desktop terminal" } : {}
+        }]
+      } : {}
     } : { promptId: state.promptId };
     const content = state.paneDisplayHeader || state.matchedPaneHeader || state.pendingCall?.command || state.pendingCall?.filePath || "approval requested";
     const input = {
@@ -9088,6 +9167,7 @@ var __testing = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ApprovalDetector,
   McpServer,
   SessionNotFoundError,
   StoredAuthFailureError,
@@ -9105,11 +9185,13 @@ var __testing = {
   isAgyStatusFooterLine,
   isComposedStatusFooter,
   isPaneInputSafetyBlocked,
+  isQuestionFooterLine,
   isSystemErrorActiveFromIndex,
   looksLikePromptSnapshot,
   parseApprovalSnapshot,
   parseMaybeJson,
   readTranscriptFirstType,
   reconstructFooter,
-  runForeignSpawnIdle
+  runForeignSpawnIdle,
+  safeIsoTimestamp
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.80",
+  "version": "2.0.82",
   "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.73",
+    "@quantiya/codevibe-core": "^2.0.74",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",