@rtrvr-ai/rover 1.2.1 → 1.3.0

package/dist/worker/rover-worker.js

@@ -1458,6 +1458,18 @@ async function processActionResponse({ request, response, tabId, prevSteps, thou
   if (Array.isArray(functionCalls) && functionCalls.length > 0) {
     const askUserCall = functionCalls.find((call) => String(call?.name || "").trim().toLowerCase() === "ask_user");
     if (askUserCall) {
+      const deferredSiblingCalls = functionCalls.filter((call) => call && call !== askUserCall && typeof call.name === "string" && call.name.trim()).map((call) => ({
+        name: String(call.name || "unknown"),
+        args: call.args || {},
+        response: {
+          status: "Failure",
+          error: "Skipped because ask_user was called. Wait for user answers before executing other tools.",
+          allowFallback: true,
+          output: {
+            status: "deferred_after_ask_user"
+          }
+        }
+      }));
       const questions = normalizeAskUserQuestions(askUserCall?.args?.questions_to_ask);
       if (!questions.length) {
         prevSteps.push({
@@ -1474,7 +1486,8 @@ async function processActionResponse({ request, response, tabId, prevSteps, thou
                 error: "Missing/invalid 'questions_to_ask'",
                 allowFallback: false
               }
-            }
+            },
+            ...deferredSiblingCalls
           ]
         });
         limitPrevSteps(prevSteps);
@@ -1489,7 +1502,11 @@ async function processActionResponse({ request, response, tabId, prevSteps, thou
           {
             name: "ask_user",
             args: {
-              questions_to_ask: questions.map((question) => ({ key: question.key, query: question.query }))
+              questions_to_ask: questions.map((question) => ({
+                key: question.key,
+                query: question.query,
+                ...question.required === false ? { required: false } : {}
+              }))
             },
             response: {
               status: "Success",
@@ -1499,7 +1516,8 @@ async function processActionResponse({ request, response, tabId, prevSteps, thou
                 questions
               }
             }
-          }
+          },
+          ...deferredSiblingCalls
         ]
       });
       limitPrevSteps(prevSteps);
@@ -1608,12 +1626,16 @@ function normalizeAskUserQuestions(rawQuestions) {
     if (seenKeys.has(rawKey))
       continue;
     seenKeys.add(rawKey);
+    const hasRequired = typeof item.required === "boolean";
+    const hasOptional = typeof item.optional === "boolean";
+    const required = hasRequired ? !!item.required : hasOptional ? !item.optional : true;
     out.push({
       key: rawKey,
       query,
       ...typeof item.question === "string" && item.question.trim() ? { question: String(item.question).trim() } : {},
       ...typeof item.id === "string" && item.id.trim() ? { id: String(item.id).trim() } : {},
-      ...Array.isArray(item.choices) ? { choices: item.choices } : {}
+      ...Array.isArray(item.choices) ? { choices: item.choices } : {},
+      required
     });
   }
   return out.slice(0, 6);
@@ -4574,12 +4596,16 @@ function normalizePlannerQuestion(input, index) {
   const key = keyCandidate || `clarification_${index + 1}`;
   if (!queryCandidate)
     return void 0;
+  const hasRequired = typeof input.required === "boolean";
+  const hasOptional = typeof input.optional === "boolean";
+  const required = hasRequired ? !!input.required : hasOptional ? !input.optional : true;
   return {
     key,
     query: queryCandidate,
     ...typeof input.id === "string" && input.id.trim() ? { id: input.id.trim() } : {},
     ...typeof input.question === "string" && input.question.trim() ? { question: input.question.trim() } : {},
-    ...Array.isArray(input.choices) ? { choices: input.choices } : {}
+    ...Array.isArray(input.choices) ? { choices: input.choices } : {},
+    required
   };
 }
 function normalizePlannerQuestions(input) {
@@ -5078,36 +5104,41 @@ function extractLatestPrevStepsFromPlanner(toolResults) {
   }
   return void 0;
 }
-async function waitForNewTabReady(logicalTabId, timeoutMs = 1e4) {
-  if (!bridgeRpc)
-    return false;
+async function waitForNewTabReady(openedTab, timeoutMs = 1e4) {
+  if (!bridgeRpc) {
+    return { ready: false, attached: false, external: !!openedTab.external };
+  }
   const pollInterval = 500;
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
     try {
       const tabs = await bridgeRpc("listSessionTabs");
       if (Array.isArray(tabs)) {
-        const target = tabs.find((t) => Number(t?.logicalTabId) === logicalTabId);
+        const target = tabs.find((t) => Number(t?.logicalTabId) === openedTab.logicalTabId);
         if (target?.external) {
-          return true;
+          return { ready: true, attached: false, external: true };
         }
         if (target?.runtimeId) {
           await new Promise((resolve) => setTimeout(resolve, 1e3));
-          return true;
+          return { ready: true, attached: true, external: false };
         }
       }
     } catch {
     }
     await new Promise((resolve) => setTimeout(resolve, pollInterval));
   }
-  return false;
+  return { ready: false, attached: false, external: !!openedTab.external };
 }
 function detectOpenedTabFromToolResult(result) {
   if (!result || typeof result !== "object")
     return void 0;
   const output = result.output ?? result;
   if (output?.openedInNewTab && typeof output?.logicalTabId === "number") {
-    return output.logicalTabId;
+    return {
+      logicalTabId: output.logicalTabId,
+      url: typeof output?.url === "string" ? output.url : void 0,
+      external: output?.external === true
+    };
   }
   return void 0;
 }
@@ -5240,11 +5271,13 @@ function clearTaskScopedContextAfterCompletion() {
   pendingAskUser = void 0;
 }
 async function maybeWaitForNewTab(result) {
-  const logicalTabId = detectOpenedTabFromToolResult(result);
-  if (logicalTabId) {
+  const openedTab = detectOpenedTabFromToolResult(result);
+  if (openedTab) {
     postStatus("Waiting for new tab to load...", void 0, "execute");
-    await waitForNewTabReady(logicalTabId);
+    const readyState = await waitForNewTabReady(openedTab);
+    return { openedTab, readyState };
   }
+  return {};
 }
 async function handleUserMessage(text, options) {
   if (!config)
@@ -5274,11 +5307,22 @@ async function handleUserMessage(text, options) {
       applyAgentPrevSteps([
         ...agentPrevSteps,
         {
-          thought: "User provided clarification answers.",
-          data: JSON.stringify({
-            ask_user_answers: normalizedAnswers.answersByKey,
-            raw_user_reply: normalizedAnswers.rawText
-          })
+          functions: [{
+            name: "ask_user",
+            args: {
+              questions_to_ask: pendingAskUser.questions.map((q) => ({
+                key: q.key,
+                query: q.query
+              }))
+            },
+            response: {
+              status: "Success",
+              output: {
+                ask_user_answers: normalizedAnswers.answersByKey,
+                raw_user_reply: normalizedAnswers.rawText
+              }
+            }
+          }]
         }
       ], { snapshot: false });
       pendingAskUser = void 0;
@@ -5418,7 +5462,44 @@ async function handleUserMessage(text, options) {
     return { route: result.route, taskComplete: true };
   }
   if (result.directToolResult) {
-    await maybeWaitForNewTab(result.directToolResult);
+    const newTabWait = await maybeWaitForNewTab(result.directToolResult);
+    if (newTabWait.openedTab && newTabWait.readyState && !newTabWait.readyState.ready && !newTabWait.readyState.external) {
+      const fallbackUrl = String(newTabWait.openedTab.url || "").trim();
+      if (fallbackUrl && bridgeRpc) {
+        postStatus("New tab did not attach; continuing in current tab", void 0, "execute");
+        try {
+          const tabCtx = await bridgeRpc("getTabContext");
+          const localLogicalTabId = Number(tabCtx?.logicalTabId ?? tabCtx?.id);
+          if (Number.isFinite(localLogicalTabId) && localLogicalTabId > 0) {
+            await bridgeRpc("executeTool", {
+              call: {
+                name: "switch_tab",
+                args: { tab_id: localLogicalTabId }
+              },
+              payload: {
+                forceLocal: true,
+                reason: "opened_tab_unattached_reset_active"
+              }
+            });
+          }
+          const fallbackResult = await bridgeRpc("executeTool", {
+            call: {
+              name: "goto_url",
+              args: {
+                tab_id: 0,
+                url: fallbackUrl
+              }
+            },
+            payload: {
+              forceLocal: true,
+              reason: "opened_tab_unattached_fallback"
+            }
+          });
+          maybePostNavigationGuardrailFromToolResult(fallbackResult);
+        } catch {
+        }
+      }
+    }
     postStatus("Verifying result", void 0, "verify");
     maybePostNavigationGuardrailFromToolResult(result.directToolResult);
     applyAgentPrevSteps(result.directToolResult.prevSteps, { snapshot: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtrvr-ai/rover",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "private": false,
   "type": "module",
   "main": "dist/rover.js",