@corbat-tech/coco 2.27.5 → 2.28.1

package/dist/cli/index.js

@@ -2377,6 +2377,22 @@ async function runGcloudADCLogin() {
     }
   }
 }
+async function runGcloudADCRevoke() {
+  try {
+    await execAsync(ADC_REVOKE_COMMAND, {
+      timeout: 12e4
+    });
+    clearADCCache();
+    return true;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (message.includes("No credentialed accounts") || message.includes("There are no credentials") || message.includes("No active credentials")) {
+      clearADCCache();
+      return true;
+    }
+    return false;
+  }
+}
 async function getGeminiADCKey() {
   const token = await getADCAccessToken();
   if (!token) return null;
@@ -2392,12 +2408,13 @@ async function getCachedADCToken() {
 function clearADCCache() {
   cachedToken = null;
 }
-var execAsync, PRINT_ACCESS_TOKEN_COMMAND, ADC_LOGIN_COMMAND, GEMINI_OAUTH_SCOPES, cachedToken;
+var execAsync, PRINT_ACCESS_TOKEN_COMMAND, ADC_LOGIN_COMMAND, ADC_REVOKE_COMMAND, GEMINI_OAUTH_SCOPES, cachedToken;
 var init_gcloud = __esm({
   "src/auth/gcloud.ts"() {
     execAsync = promisify(exec);
     PRINT_ACCESS_TOKEN_COMMAND = "gcloud auth application-default print-access-token";
     ADC_LOGIN_COMMAND = "gcloud auth application-default login";
+    ADC_REVOKE_COMMAND = "gcloud auth application-default revoke --quiet";
     GEMINI_OAUTH_SCOPES = [
       "https://www.googleapis.com/auth/cloud-platform",
       "https://www.googleapis.com/auth/generative-language.retriever"
@@ -2445,6 +2462,7 @@ __export(auth_exports, {
   requestDeviceCode: () => requestDeviceCode,
   requestGitHubDeviceCode: () => requestGitHubDeviceCode,
   runGcloudADCLogin: () => runGcloudADCLogin,
+  runGcloudADCRevoke: () => runGcloudADCRevoke,
   runOAuthFlow: () => runOAuthFlow,
   saveCopilotCredentials: () => saveCopilotCredentials,
   saveTokens: () => saveTokens,
@@ -6169,6 +6187,17 @@ function extractSseEventData(rawEvent) {
   }
   return dataLines.join("\n");
 }
+function getToolCallFingerprint(part) {
+  const name = part.functionCall?.name ?? "unknown_function";
+  let argsSerialized = "{}";
+  try {
+    argsSerialized = JSON.stringify(part.functionCall?.args ?? {});
+  } catch {
+    argsSerialized = "{}";
+  }
+  const thoughtSignature = part.thoughtSignature ?? part.thought_signature ?? part.functionCall?.thoughtSignature ?? part.functionCall?.thought_signature ?? "";
+  return `${name}:${argsSerialized}:${thoughtSignature}`;
+}
 function createVertexProvider(config) {
   const provider = new VertexProvider();
   if (config) {
@@ -6271,6 +6300,7 @@ var init_vertex = __esm({
         );
         let stopReason = "end_turn";
         let streamToolCallCounter = 0;
+        const emittedToolFingerprints = /* @__PURE__ */ new Set();
         for await (const chunk of stream) {
           const candidate = chunk.candidates?.[0];
           const parts = candidate?.content?.parts ?? [];
@@ -6279,6 +6309,11 @@ var init_vertex = __esm({
               yield { type: "text", text: part.text };
             }
             if (part.functionCall) {
+              const fingerprint = getToolCallFingerprint(part);
+              if (emittedToolFingerprints.has(fingerprint)) {
+                continue;
+              }
+              emittedToolFingerprints.add(fingerprint);
               streamToolCallCounter++;
               const geminiThoughtSignature = part.thoughtSignature ?? part.thought_signature ?? part.functionCall.thoughtSignature ?? part.functionCall.thought_signature;
               yield {
@@ -22654,6 +22689,25 @@ var init_lifecycle = __esm({
       connections = /* @__PURE__ */ new Map();
       logger = getLogger();
       static STOP_TIMEOUT_MS = 5e3;
+      /**
+       * Run an async operation with a timeout, always clearing timer resources.
+       */
+      async runWithTimeout(operation, timeoutMs, timeoutMessage) {
+        let timeoutId;
+        const timeoutPromise = new Promise((_, reject) => {
+          timeoutId = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
+          if (typeof timeoutId.unref === "function") {
+            timeoutId.unref();
+          }
+        });
+        try {
+          return await Promise.race([operation, timeoutPromise]);
+        } finally {
+          if (timeoutId) {
+            clearTimeout(timeoutId);
+          }
+        }
+      }
       /**
        * Create transport for a server config
        */
@@ -22740,15 +22794,11 @@ var init_lifecycle = __esm({
         }
         this.logger.info(`Stopping MCP server: ${name}`);
         try {
-          await Promise.race([
+          await this.runWithTimeout(
             connection.transport.disconnect(),
-            new Promise(
-              (_, reject) => setTimeout(
-                () => reject(new Error("MCP disconnect timeout")),
-                _MCPServerManager.STOP_TIMEOUT_MS
-              )
-            )
-          ]);
+            _MCPServerManager.STOP_TIMEOUT_MS,
+            "MCP disconnect timeout"
+          );
         } catch (error) {
           this.logger.error(
             `Error disconnecting server '${name}': ${error instanceof Error ? error.message : String(error)}`
@@ -22785,12 +22835,11 @@ var init_lifecycle = __esm({
         }
         const startTime = performance.now();
         try {
-          const { tools } = await Promise.race([
+          const { tools } = await this.runWithTimeout(
             connection.client.listTools(),
-            new Promise(
-              (_, reject) => setTimeout(() => reject(new Error("Health check timeout")), 5e3)
-            )
-          ]);
+            5e3,
+            "Health check timeout"
+          );
           const latencyMs = performance.now() - startTime;
           connection.healthy = true;
           connection.toolCount = tools.length;
@@ -29661,8 +29710,7 @@ var PROVIDER_DEFINITIONS = {
         name: "Gemini 3 Pro (Preview)",
         description: "Most capable Vertex Gemini 3 model (preview)",
         contextWindow: 1048576,
-        maxOutputTokens: 65536,
-        recommended: true
+        maxOutputTokens: 65536
       },
       {
         id: "gemini-3-flash-preview",
@@ -29676,7 +29724,8 @@ var PROVIDER_DEFINITIONS = {
         name: "Gemini 2.5 Pro",
         description: "Stable high-quality Vertex model for coding and complex reasoning",
         contextWindow: 1048576,
-        maxOutputTokens: 65536
+        maxOutputTokens: 65536,
+        recommended: true
       },
       {
         id: "gemini-2.5-flash",
@@ -34417,6 +34466,41 @@ async function setupGcloudADC(provider) {
   if (adc.status === "ok" && adc.token) {
     console.log(chalk.green("   \u2713 gcloud ADC is already configured!"));
     console.log();
+    const adcChoice = await p26.select({
+      message: "ADC session detected. What do you want to do?",
+      options: [
+        { value: "use", label: "Use current ADC session" },
+        { value: "switch", label: "Switch Google account (revoke and re-login)" },
+        { value: "cancel", label: "Cancel" }
+      ]
+    });
+    if (p26.isCancel(adcChoice) || adcChoice === "cancel") return null;
+    if (adcChoice === "switch") {
+      const revokeSpinner = p26.spinner();
+      revokeSpinner.start("Revoking current gcloud ADC session...");
+      const revoked = await runGcloudADCRevoke();
+      revokeSpinner.stop(
+        revoked ? "Current ADC session revoked" : "Could not revoke current ADC session"
+      );
+      if (!revoked) {
+        p26.log.error("Could not revoke gcloud ADC from Coco.");
+        console.log(chalk.dim("   Try manually: gcloud auth application-default revoke"));
+        console.log();
+        return null;
+      }
+      const loginSpinner = p26.spinner();
+      loginSpinner.start("Running `gcloud auth application-default login`...");
+      const loginOk = await runGcloudADCLogin();
+      loginSpinner.stop(loginOk ? "gcloud login flow completed" : "gcloud login flow failed");
+      if (!loginOk) return null;
+      const recheckSpinner = p26.spinner();
+      recheckSpinner.start("Verifying ADC credentials after re-login...");
+      adc = await inspectADC();
+      recheckSpinner.stop(
+        adc.status === "ok" && adc.token ? "ADC credentials verified" : "ADC verification failed after re-login"
+      );
+      if (!(adc.status === "ok" && adc.token)) return null;
+    }
     p26.log.success("Authentication verified");
     const vertexSettings2 = provider.id === "vertex" ? await promptVertexSettings() : void 0;
     if (provider.id === "vertex" && !vertexSettings2) return null;
@@ -34515,6 +34599,19 @@ async function setupGcloudADC(provider) {
 async function promptVertexSettings() {
   const projectDefault = process.env["VERTEX_PROJECT"] ?? process.env["GOOGLE_CLOUD_PROJECT"] ?? process.env["GCLOUD_PROJECT"] ?? "";
   const locationDefault = process.env["VERTEX_LOCATION"] ?? process.env["GOOGLE_CLOUD_LOCATION"] ?? "global";
+  console.log(chalk.dim("\n   Need help finding these values?"));
+  console.log(chalk.cyan("   $ gcloud projects list"));
+  console.log(chalk.cyan("   $ gcloud config set project <PROJECT_ID>"));
+  console.log(chalk.cyan("   $ gcloud config get-value project"));
+  console.log(chalk.cyan("   $ gcloud config get-value compute/region"));
+  console.log(
+    chalk.cyan("   $ gcloud config set compute/region <LOCATION>    # e.g. global, europe-west1")
+  );
+  console.log(
+    chalk.dim(
+      "   (If compute/region is unset, set it as above, then use that value for Vertex location)\n"
+    )
+  );
   const project = await p26.text({
     message: "Google Cloud project ID:",
     placeholder: projectDefault || "my-gcp-project",
@@ -35578,6 +35675,15 @@ async function switchProvider(initialProvider, session) {
   const apiKey = supportsApiKey ? process.env[newProvider.envVar] : void 0;
   const hasOAuth = supportsOAuth(newProvider.id) || newProvider.supportsOAuth;
   const hasGcloudADC = newProvider.supportsGcloudADC;
+  let adcConnected = false;
+  if (hasGcloudADC) {
+    try {
+      const adc = await inspectADC();
+      adcConnected = adc.status === "ok" && adc.token !== null;
+    } catch {
+      adcConnected = false;
+    }
+  }
   const oauthProviderName = newProvider.id === "copilot" ? "copilot" : newProvider.id === "gemini" ? "gemini" : "openai";
   let oauthConnected = false;
   if (hasOAuth) {
@@ -35625,8 +35731,8 @@ async function switchProvider(initialProvider, session) {
     if (hasGcloudADC) {
       authOptions.push({
         value: "gcloud",
-        label: "\u2601\uFE0F Use gcloud ADC",
-        hint: "Authenticate via gcloud CLI"
+        label: adcConnected ? "\u2601\uFE0F Use gcloud ADC (configured \u2713)" : "\u2601\uFE0F Use gcloud ADC",
+        hint: adcConnected ? "Reuse current ADC session or switch account" : "Authenticate via gcloud CLI"
       });
     }
     if (supportsApiKey) {
@@ -35644,7 +35750,7 @@ async function switchProvider(initialProvider, session) {
         });
       }
     }
-    if (oauthConnected || apiKey) {
+    if (oauthConnected || apiKey || adcConnected) {
       authOptions.push({
         value: "remove",
         label: "\u{1F5D1}\uFE0F  Remove saved credentials",
@@ -35787,7 +35893,13 @@ Using existing API key...`));
           label: "\u{1F511} Remove API key"
         });
       }
-      if (oauthConnected && apiKey) {
+      if (adcConnected) {
+        removeOptions.push({
+          value: "gcloud",
+          label: "\u2601\uFE0F Revoke gcloud ADC session"
+        });
+      }
+      if (oauthConnected && apiKey || adcConnected && (oauthConnected || apiKey)) {
         removeOptions.push({
           value: "all",
           label: "\u{1F5D1}\uFE0F  Remove all credentials"
@@ -35818,13 +35930,25 @@ Using existing API key...`));
         console.log(chalk.green("\u2713 API key removed from session"));
         console.log(chalk.dim(`  Note: If key is in ~/.coco/.env, remove it there too`));
       }
+      if (removeChoice === "gcloud" || removeChoice === "all") {
+        const revokeSpinner = p26.spinner();
+        revokeSpinner.start("Revoking gcloud ADC session...");
+        const revoked = await runGcloudADCRevoke();
+        revokeSpinner.stop(revoked ? "gcloud ADC session revoked" : "Failed to revoke gcloud ADC");
+        if (!revoked) {
+          console.log(chalk.yellow("\u26A0\uFE0F Could not revoke ADC from Coco."));
+          console.log(chalk.dim("   Try manually: gcloud auth application-default revoke"));
+        } else {
+          console.log(chalk.green("\u2713 gcloud ADC session revoked"));
+        }
+      }
       console.log("");
       return false;
     }
   }
   const rememberedModel = await getLastUsedModel(newProvider.id);
   const recommendedModel = getRecommendedModel(newProvider.id);
-  const newModel = rememberedModel || recommendedModel?.id || newProvider.models[0]?.id || "";
+  let newModel = rememberedModel || recommendedModel?.id || newProvider.models[0]?.id || "";
   const resolvedVertexProject = newProvider.id === "vertex" ? (vertexSettings?.project ?? session.config.provider.project ?? process.env["VERTEX_PROJECT"] ?? process.env["GOOGLE_CLOUD_PROJECT"] ?? process.env["GCLOUD_PROJECT"] ?? "").trim() : void 0;
   const resolvedVertexLocation = newProvider.id === "vertex" ? (vertexSettings?.location ?? session.config.provider.location ?? process.env["VERTEX_LOCATION"] ?? process.env["GOOGLE_CLOUD_LOCATION"] ?? "global").trim() : void 0;
   const spinner18 = p26.spinner();
@@ -35835,7 +35959,31 @@ Using existing API key...`));
       project: resolvedVertexProject,
       location: resolvedVertexLocation
     });
-    const available = await testProvider.isAvailable();
+    let available = await testProvider.isAvailable();
+    if (!available && newProvider.id === "vertex") {
+      const fallbackModels = ["gemini-2.5-pro", "gemini-2.5-flash", "gemini-2.0-flash-001"].filter(
+        (modelId) => modelId !== newModel
+      );
+      for (const fallbackModel of fallbackModels) {
+        const fallbackProvider = await createProvider(internalProviderId, {
+          model: fallbackModel,
+          project: resolvedVertexProject,
+          location: resolvedVertexLocation
+        });
+        const fallbackAvailable = await fallbackProvider.isAvailable();
+        if (fallbackAvailable) {
+          newModel = fallbackModel;
+          available = true;
+          console.log(
+            chalk.yellow(
+              `
+\u26A0\uFE0F  The selected Vertex model was not available. Using fallback model: ${fallbackModel}`
+            )
+          );
+          break;
+        }
+      }
+    }
     if (!available) {
       spinner18.stop(chalk.red("Connection failed"));
       console.log(chalk.red(`
@@ -35910,7 +36058,36 @@ async function setupGcloudADCForProvider(_provider) {
   );
   if (adc.status === "ok" && adc.token) {
     console.log(chalk.green("   \u2713 gcloud ADC is already configured!\n"));
-    return true;
+    const adcChoice = await p26.select({
+      message: "ADC session detected. What do you want to do?",
+      options: [
+        {
+          value: "use",
+          label: "Use current ADC session"
+        },
+        {
+          value: "switch",
+          label: "Switch Google account (revoke and re-login)"
+        },
+        {
+          value: "cancel",
+          label: "Cancel"
+        }
+      ]
+    });
+    if (p26.isCancel(adcChoice) || adcChoice === "cancel") return false;
+    if (adcChoice === "use") return true;
+    const revokeSpinner = p26.spinner();
+    revokeSpinner.start("Revoking current gcloud ADC session...");
+    const revoked = await runGcloudADCRevoke();
+    revokeSpinner.stop(
+      revoked ? "Current ADC session revoked" : "Could not revoke current ADC session"
+    );
+    if (!revoked) {
+      console.log(chalk.yellow("\u26A0\uFE0F Could not revoke ADC from Coco."));
+      console.log(chalk.dim("   Try manually: gcloud auth application-default revoke\n"));
+      return false;
+    }
   }
   console.log(chalk.yellow("\n   No reusable gcloud ADC session was found for Coco."));
   console.log();
@@ -35956,6 +36133,19 @@ async function setupGcloudADCForProvider(_provider) {
 async function promptVertexSettings2(defaults) {
   const projectDefault = defaults?.project ?? process.env["VERTEX_PROJECT"] ?? process.env["GOOGLE_CLOUD_PROJECT"] ?? process.env["GCLOUD_PROJECT"] ?? "";
   const locationDefault = defaults?.location ?? process.env["VERTEX_LOCATION"] ?? process.env["GOOGLE_CLOUD_LOCATION"] ?? "global";
+  console.log(chalk.dim("\n   Need help finding these values?"));
+  console.log(chalk.cyan("   $ gcloud projects list"));
+  console.log(chalk.cyan("   $ gcloud config set project <PROJECT_ID>"));
+  console.log(chalk.cyan("   $ gcloud config get-value project"));
+  console.log(chalk.cyan("   $ gcloud config get-value compute/region"));
+  console.log(
+    chalk.cyan("   $ gcloud config set compute/region <LOCATION>    # e.g. global, europe-west1")
+  );
+  console.log(
+    chalk.dim(
+      "   (If compute/region is unset, set it as above, then use that value for Vertex location)\n"
+    )
+  );
   const project = await p26.text({
     message: "Google Cloud project ID:",
     placeholder: projectDefault || "my-gcp-project",
@@ -53130,6 +53320,30 @@ async function executeAgentTurn(session, userMessage, provider, toolRegistry, op
 [... ${omitted.toLocaleString()} characters omitted \u2014 use read_file with offset/limit to retrieve more of '${toolName}' output ...]
 ${tail}`;
   }
+  function stableSerialize(value) {
+    if (value === null || typeof value !== "object") {
+      try {
+        return JSON.stringify(value);
+      } catch {
+        return "null";
+      }
+    }
+    if (Array.isArray(value)) {
+      return `[${value.map((item) => stableSerialize(item)).join(",")}]`;
+    }
+    const objectValue = value;
+    const keys = Object.keys(objectValue).sort();
+    return `{${keys.map((key) => `${JSON.stringify(key)}:${stableSerialize(objectValue[key])}`).join(",")}}`;
+  }
+  function getToolCallDedupeFingerprint(toolCall) {
+    if (toolCall.name === "bash_exec") {
+      const input = toolCall.input ?? {};
+      const command = String(input.command ?? "").replace(/\s+/g, " ").trim();
+      const cwd = String(input.cwd ?? "").replace(/\s+/g, " ").trim();
+      return `bash_exec:${command}:cwd=${cwd}`;
+    }
+    return `${toolCall.name}:${stableSerialize(toolCall.input ?? {})}`;
+  }
   function shouldRecoverNoToolTurn(stopReason, content) {
     const trimmed = content.trim();
     if (stopReason === "tool_use") {
@@ -53328,9 +53542,19 @@ ${tail}`;
       break;
     }
     noToolRecoveryAttempts = 0;
+    const dedupedToolCalls = [];
+    const seenToolCallFingerprints = /* @__PURE__ */ new Set();
+    for (const toolCall of collectedToolCalls) {
+      const fingerprint = getToolCallDedupeFingerprint(toolCall);
+      if (seenToolCallFingerprints.has(fingerprint)) {
+        continue;
+      }
+      seenToolCallFingerprints.add(fingerprint);
+      dedupedToolCalls.push(toolCall);
+    }
     const response = {
       content: responseContent,
-      toolCalls: collectedToolCalls
+      toolCalls: dedupedToolCalls
     };
     const toolResults = [];
     const toolUses = [];