@corbat-tech/coco 2.27.4 → 2.27.5

package/dist/cli/index.js

@@ -13,10 +13,10 @@ import JSON5 from 'json5';
 import * as crypto from 'crypto';
 import { randomUUID, randomBytes, createHash } from 'crypto';
 import * as http from 'http';
-import * as p26 from '@clack/prompts';
-import chalk from 'chalk';
 import { execFile, execSync, spawn, execFileSync, exec } from 'child_process';
 import { promisify } from 'util';
+import * as p26 from '@clack/prompts';
+import chalk from 'chalk';
 import { Logger } from 'tslog';
 import Anthropic from '@anthropic-ai/sdk';
 import { jsonrepair } from 'jsonrepair';
@@ -1477,6 +1477,32 @@ async function exchangeForCopilotToken(githubToken) {
   }
   return await response.json();
 }
+async function getGitHubLogin(githubToken) {
+  try {
+    const response = await fetch("https://api.github.com/user", {
+      method: "GET",
+      headers: {
+        Authorization: `token ${githubToken}`,
+        Accept: "application/json",
+        "User-Agent": "Corbat-Coco/1.0"
+      }
+    });
+    if (!response.ok) return null;
+    const data = await response.json();
+    return data.login ?? null;
+  } catch {
+    return null;
+  }
+}
+async function getGitHubCliToken() {
+  try {
+    const { stdout } = await execFileAsync("gh", ["auth", "token"], { timeout: 5e3 });
+    const token = stdout.trim();
+    return token.length > 0 ? token : null;
+  } catch {
+    return null;
+  }
+}
 function getCopilotBaseUrl(accountType) {
   if (accountType && accountType in COPILOT_BASE_URLS) {
     return COPILOT_BASE_URLS[accountType];
@@ -1514,10 +1540,11 @@ function isCopilotTokenExpired(creds) {
 }
 async function getValidCopilotToken() {
   const creds = await loadCopilotCredentials();
-  if (!creds) return null;
-  const envToken = process.env["GITHUB_TOKEN"] || process.env["GH_TOKEN"];
-  const githubToken = envToken || creds.githubToken;
-  if (!isCopilotTokenExpired(creds) && creds.copilotToken) {
+  const envToken = process.env["COPILOT_GITHUB_TOKEN"] || process.env["GH_TOKEN"] || process.env["GITHUB_TOKEN"];
+  const fallbackGhToken = await getGitHubCliToken();
+  const githubToken = envToken || creds?.githubToken || fallbackGhToken;
+  if (!githubToken) return null;
+  if (creds && !isCopilotTokenExpired(creds) && creds.copilotToken) {
     return {
       token: creds.copilotToken,
       baseUrl: getCopilotBaseUrl(creds.accountType),
@@ -1527,11 +1554,11 @@ async function getValidCopilotToken() {
   try {
     const copilotToken = await exchangeForCopilotToken(githubToken);
     const updatedCreds = {
-      ...creds,
-      githubToken: creds.githubToken,
+      ...creds ?? { githubToken },
+      githubToken: creds?.githubToken ?? githubToken,
       copilotToken: copilotToken.token,
       copilotTokenExpiresAt: copilotToken.expires_at * 1e3,
-      accountType: copilotToken.annotations?.copilot_plan ?? creds.accountType
+      accountType: copilotToken.annotations?.copilot_plan ?? creds?.accountType
     };
     await saveCopilotCredentials(updatedCreds);
     return {
@@ -1547,7 +1574,7 @@ async function getValidCopilotToken() {
     throw error;
   }
 }
-var COPILOT_CLIENT_ID, GITHUB_DEVICE_CODE_URL, GITHUB_TOKEN_URL, COPILOT_TOKEN_URL, COPILOT_BASE_URLS, DEFAULT_COPILOT_BASE_URL, REFRESH_BUFFER_MS, CopilotAuthError, CopilotCredentialsSchema;
+var COPILOT_CLIENT_ID, GITHUB_DEVICE_CODE_URL, GITHUB_TOKEN_URL, COPILOT_TOKEN_URL, COPILOT_BASE_URLS, DEFAULT_COPILOT_BASE_URL, REFRESH_BUFFER_MS, execFileAsync, CopilotAuthError, CopilotCredentialsSchema;
 var init_copilot = __esm({
   "src/auth/copilot.ts"() {
     COPILOT_CLIENT_ID = "Iv1.b507a08c87ecfe98";
@@ -1561,6 +1588,7 @@ var init_copilot = __esm({
     };
     DEFAULT_COPILOT_BASE_URL = "https://api.githubcopilot.com";
     REFRESH_BUFFER_MS = 6e4;
+    execFileAsync = promisify(execFile);
     CopilotAuthError = class extends Error {
       constructor(message, permanent) {
         super(message);
@@ -1648,13 +1676,13 @@ async function openBrowser(url) {
   const platform = process.platform;
   try {
     if (platform === "darwin") {
-      await execFileAsync("open", [sanitizedUrl]);
+      await execFileAsync2("open", [sanitizedUrl]);
     } else if (platform === "win32") {
-      await execFileAsync("rundll32", ["url.dll,FileProtocolHandler", sanitizedUrl]);
+      await execFileAsync2("rundll32", ["url.dll,FileProtocolHandler", sanitizedUrl]);
     } else if (isWSL) {
-      await execFileAsync("cmd.exe", ["/c", "start", "", sanitizedUrl]);
+      await execFileAsync2("cmd.exe", ["/c", "start", "", sanitizedUrl]);
     } else {
-      await execFileAsync("xdg-open", [sanitizedUrl]);
+      await execFileAsync2("xdg-open", [sanitizedUrl]);
     }
     return true;
   } catch {
@@ -1704,7 +1732,7 @@ async function openBrowserFallback(url) {
   }
   for (const { cmd, args } of commands2) {
     try {
-      await execFileAsync(cmd, args);
+      await execFileAsync2(cmd, args);
       return true;
     } catch {
       continue;
@@ -2168,6 +2196,10 @@ async function runCopilotDeviceFlow() {
       }
     );
     spinner18.stop(chalk.green("\u2713 GitHub authentication successful!"));
+    const githubLogin = await getGitHubLogin(githubToken);
+    if (githubLogin) {
+      console.log(chalk.dim(`   Authenticated as: @${githubLogin}`));
+    }
     console.log(chalk.dim("   Exchanging token for Copilot access..."));
     const copilotToken = await exchangeForCopilotToken(githubToken);
     const creds = {
@@ -2194,6 +2226,11 @@ async function runCopilotDeviceFlow() {
       console.log(chalk.red("   \u2717 GitHub Copilot is not enabled for this account."));
       console.log(chalk.dim("   Please ensure you have an active Copilot subscription:"));
       console.log(chalk.cyan("   \u2192 https://github.com/settings/copilot"));
+      console.log(
+        chalk.dim(
+          "   If this account is wrong, sign out of github.com in your browser and run /provider again."
+        )
+      );
     } else if (errorMsg.includes("expired") || errorMsg.includes("timed out")) {
       console.log(chalk.yellow("   \u26A0 Authentication timed out. Please try again."));
     } else if (errorMsg.includes("denied")) {
@@ -2229,7 +2266,7 @@ async function getOrRefreshOAuthToken(provider) {
   }
   return null;
 }
-var execFileAsync;
+var execFileAsync2;
 var init_flow = __esm({
   "src/auth/flow.ts"() {
     init_oauth();
@@ -2237,7 +2274,7 @@ var init_flow = __esm({
     init_callback_server();
     init_platform();
     init_copilot();
-    execFileAsync = promisify(execFile);
+    execFileAsync2 = promisify(execFile);
   }
 });
 function getADCPath() {
@@ -2585,7 +2622,7 @@ function getDefaultModel(provider) {
     case "anthropic":
       return process.env["ANTHROPIC_MODEL"] ?? "claude-opus-4-6";
     case "openai":
-      return process.env["OPENAI_MODEL"] ?? "gpt-5.4-codex";
+      return process.env["OPENAI_MODEL"] ?? "gpt-5.3-codex";
     case "gemini":
       return process.env["GEMINI_MODEL"] ?? "gemini-3.1-pro-preview";
     case "vertex":
@@ -3773,7 +3810,7 @@ var init_openai = __esm({
     init_errors();
     init_retry();
     init_tool_call_normalizer();
-    DEFAULT_MODEL2 = "gpt-5.4-codex";
+    DEFAULT_MODEL2 = "gpt-5.3-codex";
     CONTEXT_WINDOWS2 = {
       // OpenAI models
       "gpt-4o": 128e3,
@@ -4983,7 +5020,7 @@ var init_codex = __esm({
     init_retry();
     init_tool_call_normalizer();
     CODEX_API_ENDPOINT = "https://chatgpt.com/backend-api/codex/responses";
-    DEFAULT_MODEL3 = "gpt-5.4-codex";
+    DEFAULT_MODEL3 = "gpt-5.3-codex";
     CONTEXT_WINDOWS3 = {
       "gpt-5.4-codex": 2e5,
       "gpt-5.3-codex": 2e5,
@@ -5757,11 +5794,12 @@ function createGeminiProvider(config) {
   }
   return provider;
 }
-var DEFAULT_MODEL5, CONTEXT_WINDOWS5, GeminiProvider;
+var DEFAULT_MODEL5, SKIP_THOUGHT_SIGNATURE_VALIDATOR, CONTEXT_WINDOWS5, GeminiProvider;
 var init_gemini = __esm({
   "src/providers/gemini.ts"() {
     init_errors();
     DEFAULT_MODEL5 = "gemini-3.1-pro-preview";
+    SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator";
     CONTEXT_WINDOWS5 = {
       "gemini-3.1-pro-preview": 1e6,
       "gemini-3.1-flash-lite-preview": 1e6,
@@ -5854,30 +5892,29 @@ var init_gemini = __esm({
             if (text15) {
               yield { type: "text", text: text15 };
             }
-            const functionCalls = this.extractFunctionCalls(chunk);
-            for (const functionCall of functionCalls) {
-              const toolCallId = functionCall.id ?? `gemini_call_${++fallbackToolCounter}`;
+            const toolCalls = this.extractToolCalls(chunk, { includeLegacyFunctionCalls: true });
+            for (const toolCall of toolCalls) {
+              const toolCallId = toolCall.id ?? `gemini_call_${++fallbackToolCounter}`;
               if (emittedToolIds.has(toolCallId)) continue;
               emittedToolIds.add(toolCallId);
-              const toolCall = {
-                id: toolCallId,
-                name: functionCall.name ?? "unknown_function",
-                input: functionCall.args ?? {}
+              const normalizedToolCall = {
+                ...toolCall,
+                id: toolCallId
               };
               yield {
                 type: "tool_use_start",
                 toolCall: {
-                  id: toolCall.id,
-                  name: toolCall.name
+                  id: normalizedToolCall.id,
+                  name: normalizedToolCall.name
                 }
               };
               yield {
                 type: "tool_use_end",
-                toolCall
+                toolCall: normalizedToolCall
               };
             }
             const finishReason = chunk.candidates?.[0]?.finishReason;
-            if (functionCalls.length > 0) {
+            if (toolCalls.length > 0) {
               streamStopReason = "tool_use";
             } else if (finishReason) {
               streamStopReason = this.mapFinishReason(finishReason);
@@ -6001,13 +6038,18 @@ var init_gemini = __esm({
             });
           } else if (block.type === "tool_use") {
             const toolUse = block;
-            parts.push({
-              functionCall: {
-                id: toolUse.id,
-                name: toolUse.name,
-                args: toolUse.input
-              }
-            });
+            const thoughtSignature = toolUse.geminiThoughtSignature ?? SKIP_THOUGHT_SIGNATURE_VALIDATOR;
+            const functionCall = {
+              id: toolUse.id,
+              name: toolUse.name,
+              args: toolUse.input
+            };
+            const part = {
+              functionCall,
+              thoughtSignature,
+              thought_signature: thoughtSignature
+            };
+            parts.push(part);
           }
         }
         return parts.length > 0 ? parts : [{ text: "" }];
@@ -6031,13 +6073,31 @@ var init_gemini = __esm({
           allowedFunctionNames: [choice.name]
         };
       }
-      extractFunctionCalls(response) {
-        if (response.functionCalls && response.functionCalls.length > 0) {
-          return response.functionCalls;
+      extractThoughtSignatureFromPart(part) {
+        const withSignature = part;
+        return withSignature.thoughtSignature ?? withSignature.thought_signature ?? withSignature.functionCall?.thoughtSignature ?? withSignature.functionCall?.thought_signature;
+      }
+      extractToolCalls(response, options) {
+        const toolCallsFromParts = (response.candidates?.[0]?.content?.parts ?? []).filter((part) => !!part.functionCall).map((part, index) => ({
+          id: part.functionCall.id ?? `gemini_call_${index + 1}`,
+          name: part.functionCall.name ?? "unknown_function",
+          input: part.functionCall.args ?? {},
+          geminiThoughtSignature: this.extractThoughtSignatureFromPart(part)
+        }));
+        if (toolCallsFromParts.length > 0) {
+          return toolCallsFromParts;
         }
-        const candidate = response.candidates?.[0];
-        const parts = candidate?.content?.parts ?? [];
-        return parts.filter((part) => !!part.functionCall).map((part) => part.functionCall).filter(Boolean);
+        if (!options?.includeLegacyFunctionCalls || !response.functionCalls?.length) {
+          return [];
+        }
+        return response.functionCalls.map((functionCall, index) => ({
+          id: functionCall.id ?? `gemini_call_${index + 1}`,
+          name: functionCall.name ?? "unknown_function",
+          input: functionCall.args ?? {},
+          geminiThoughtSignature: this.extractThoughtSignatureFromPart({
+            functionCall
+          })
+        }));
       }
       parseResponse(response, model) {
         const usage = response.usageMetadata;
@@ -6054,11 +6114,7 @@ var init_gemini = __esm({
       }
       parseResponseWithTools(response, model) {
         const usage = response.usageMetadata;
-        const toolCalls = this.extractFunctionCalls(response).map((functionCall, index) => ({
-          id: functionCall.id ?? `gemini_call_${index + 1}`,
-          name: functionCall.name ?? "unknown_function",
-          input: functionCall.args ?? {}
-        }));
+        const toolCalls = this.extractToolCalls(response, { includeLegacyFunctionCalls: true });
         return {
           id: `gemini-${Date.now()}`,
           content: response.text ?? "",
@@ -6106,6 +6162,13 @@ var init_gemini = __esm({
 });
 
 // src/providers/vertex.ts
+function extractSseEventData(rawEvent) {
+  const dataLines = rawEvent.split(/\r?\n/).filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trim()).filter(Boolean);
+  if (dataLines.length === 0) {
+    return null;
+  }
+  return dataLines.join("\n");
+}
 function createVertexProvider(config) {
   const provider = new VertexProvider();
   if (config) {
@@ -6114,7 +6177,7 @@ function createVertexProvider(config) {
   }
   return provider;
 }
-var DEFAULT_MODEL6, DEFAULT_BASE_URL, DEFAULT_LOCATION, CONTEXT_WINDOWS6, VertexProvider;
+var DEFAULT_MODEL6, DEFAULT_BASE_URL, DEFAULT_LOCATION, CONTEXT_WINDOWS6, SKIP_THOUGHT_SIGNATURE_VALIDATOR2, VertexProvider;
 var init_vertex = __esm({
   "src/providers/vertex.ts"() {
     init_errors();
@@ -6124,12 +6187,15 @@ var init_vertex = __esm({
     DEFAULT_BASE_URL = "https://aiplatform.googleapis.com/v1";
     DEFAULT_LOCATION = "global";
     CONTEXT_WINDOWS6 = {
+      "gemini-3-pro-preview": 1048576,
+      "gemini-3-flash-preview": 1048576,
       "gemini-2.5-pro": 1048576,
       "gemini-2.5-flash": 1048576,
       "gemini-2.5-flash-lite": 1048576,
       "gemini-2.0-flash-001": 1048576,
       "gemini-2.0-flash-lite-001": 1048576
     };
+    SKIP_THOUGHT_SIGNATURE_VALIDATOR2 = "skip_thought_signature_validator";
     VertexProvider = class {
       id = "vertex";
       name = "Google Vertex AI Gemini";
@@ -6214,12 +6280,14 @@ var init_vertex = __esm({
             }
             if (part.functionCall) {
               streamToolCallCounter++;
+              const geminiThoughtSignature = part.thoughtSignature ?? part.thought_signature ?? part.functionCall.thoughtSignature ?? part.functionCall.thought_signature;
               yield {
                 type: "tool_use_start",
                 toolCall: {
                   id: `vertex_call_${streamToolCallCounter}`,
                   name: part.functionCall.name,
-                  input: part.functionCall.args ?? {}
+                  input: part.functionCall.args ?? {},
+                  geminiThoughtSignature
                 }
               };
               yield {
@@ -6227,7 +6295,8 @@ var init_vertex = __esm({
                 toolCall: {
                   id: `vertex_call_${streamToolCallCounter}`,
                   name: part.functionCall.name,
-                  input: part.functionCall.args ?? {}
+                  input: part.functionCall.args ?? {},
+                  geminiThoughtSignature
                 }
               };
             }
@@ -6360,11 +6429,14 @@ var init_vertex = __esm({
             });
           } else if (block.type === "tool_use") {
             const toolUse = block;
+            const thoughtSignature = toolUse.geminiThoughtSignature ?? SKIP_THOUGHT_SIGNATURE_VALIDATOR2;
             parts.push({
               functionCall: {
                 name: toolUse.name,
                 args: toolUse.input
-              }
+              },
+              thoughtSignature,
+              thought_signature: thoughtSignature
             });
           }
         }
@@ -6456,22 +6528,27 @@ var init_vertex = __esm({
           if (done) break;
           buffer += decoder.decode(value, { stream: true });
           while (true) {
-            const eventBoundary = buffer.indexOf("\n\n");
-            if (eventBoundary === -1) break;
-            const rawEvent = buffer.slice(0, eventBoundary);
-            buffer = buffer.slice(eventBoundary + 2);
-            const dataLines = rawEvent.split("\n").filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trim()).filter(Boolean);
-            for (const line of dataLines) {
-              if (line === "[DONE]") return;
-              yield JSON.parse(line);
+            const boundaryMatch = /\r?\n\r?\n/.exec(buffer);
+            if (!boundaryMatch || boundaryMatch.index === void 0) break;
+            const rawEvent = buffer.slice(0, boundaryMatch.index);
+            buffer = buffer.slice(boundaryMatch.index + boundaryMatch[0].length);
+            const data = extractSseEventData(rawEvent);
+            if (!data || data === "[DONE]") {
+              if (data === "[DONE]") return;
+              continue;
+            }
+            try {
+              yield JSON.parse(data);
+            } catch {
+              continue;
             }
           }
         }
-        const trailing = buffer.trim();
-        if (trailing.startsWith("data:")) {
-          const line = trailing.slice(5).trim();
-          if (line && line !== "[DONE]") {
-            yield JSON.parse(line);
+        const trailingData = extractSseEventData(buffer.trim());
+        if (trailingData && trailingData !== "[DONE]") {
+          try {
+            yield JSON.parse(trailingData);
+          } catch {
           }
         }
       }
@@ -6504,7 +6581,8 @@ var init_vertex = __esm({
             toolCalls.push({
               id: `vertex_call_${toolIndex}`,
               name: part.functionCall.name,
-              input: part.functionCall.args ?? {}
+              input: part.functionCall.args ?? {},
+              geminiThoughtSignature: part.thoughtSignature ?? part.thought_signature ?? part.functionCall.thoughtSignature ?? part.functionCall.thought_signature
             });
           }
         }
@@ -6609,6 +6687,7 @@ var init_pricing = __esm({
       "gpt-4o": { inputPerMillion: 2.5, outputPerMillion: 10, contextWindow: 128e3 },
       "gpt-4o-mini": { inputPerMillion: 0.15, outputPerMillion: 0.6, contextWindow: 128e3 },
       // Google Gemini models
+      "gemini-3-pro-preview": { inputPerMillion: 1.25, outputPerMillion: 5, contextWindow: 1e6 },
       "gemini-3.1-pro-preview": { inputPerMillion: 1.25, outputPerMillion: 5, contextWindow: 1e6 },
       "gemini-3-flash-preview": {
         inputPerMillion: 0.15,
@@ -10446,17 +10525,55 @@ async function saveTrustSettings(settings) {
     console.warn(`[Trust] Failed to save trust settings: ${msg}`);
   }
 }
-async function loadTrustedTools(projectPath) {
+function getProjectTrustSettingsFile(projectPath) {
+  return path39__default.join(projectPath, PROJECT_TRUST_FILE_RELATIVE_PATH);
+}
+async function loadProjectTrustSettings(projectPath) {
   const settings = await loadTrustSettings();
+  const legacyTrusted = settings.projectTrusted[projectPath] ?? [];
+  const legacyDenied = settings.projectDenied[projectPath] ?? [];
+  const defaultState = {
+    trusted: legacyTrusted,
+    denied: legacyDenied,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  try {
+    const content = await fs35__default.readFile(getProjectTrustSettingsFile(projectPath), "utf-8");
+    const raw = JSON.parse(content);
+    return {
+      trusted: raw.trusted ?? defaultState.trusted,
+      denied: raw.denied ?? defaultState.denied,
+      updatedAt: raw.updatedAt ?? defaultState.updatedAt
+    };
+  } catch {
+    return defaultState;
+  }
+}
+async function saveProjectTrustSettings(projectPath, settings) {
+  try {
+    const filePath = getProjectTrustSettingsFile(projectPath);
+    await fs35__default.mkdir(path39__default.dirname(filePath), { recursive: true });
+    settings.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    await fs35__default.writeFile(filePath, JSON.stringify(settings, null, 2), "utf-8");
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    console.warn(`[Trust] Failed to save project trust settings: ${msg}`);
+  }
+}
+async function loadTrustedTools(projectPath) {
+  const [settings, projectSettings] = await Promise.all([
+    loadTrustSettings(),
+    loadProjectTrustSettings(projectPath)
+  ]);
   const trusted = /* @__PURE__ */ new Set();
   for (const tool of settings.globalTrusted) {
     trusted.add(tool);
   }
-  const projectTrusted = settings.projectTrusted[projectPath] ?? [];
+  const projectTrusted = projectSettings.trusted;
   for (const tool of projectTrusted) {
     trusted.add(tool);
   }
-  const projectDenied = settings.projectDenied[projectPath] ?? [];
+  const projectDenied = projectSettings.denied;
   for (const tool of projectDenied) {
     trusted.delete(tool);
   }
@@ -10469,61 +10586,54 @@ async function saveTrustedTool(toolName, projectPath, global = false) {
       settings.globalTrusted.push(toolName);
     }
   } else if (projectPath) {
-    if (!settings.projectTrusted[projectPath]) {
-      settings.projectTrusted[projectPath] = [];
-    }
-    const projectTrusted = settings.projectTrusted[projectPath];
-    if (projectTrusted && !projectTrusted.includes(toolName)) {
-      projectTrusted.push(toolName);
+    const projectSettings = await loadProjectTrustSettings(projectPath);
+    if (!projectSettings.trusted.includes(toolName)) {
+      projectSettings.trusted.push(toolName);
     }
+    projectSettings.denied = projectSettings.denied.filter((t) => t !== toolName);
+    await saveProjectTrustSettings(projectPath, projectSettings);
+  }
+  if (global) {
+    await saveTrustSettings(settings);
   }
-  await saveTrustSettings(settings);
 }
 async function removeTrustedTool(toolName, projectPath, global = false) {
   const settings = await loadTrustSettings();
   if (global) {
     settings.globalTrusted = settings.globalTrusted.filter((t) => t !== toolName);
+    await saveTrustSettings(settings);
   } else {
-    const projectTrusted = settings.projectTrusted[projectPath];
-    if (projectTrusted) {
-      settings.projectTrusted[projectPath] = projectTrusted.filter((t) => t !== toolName);
-    }
+    const projectSettings = await loadProjectTrustSettings(projectPath);
+    projectSettings.trusted = projectSettings.trusted.filter((t) => t !== toolName);
+    await saveProjectTrustSettings(projectPath, projectSettings);
   }
-  await saveTrustSettings(settings);
 }
 async function saveDeniedTool(toolName, projectPath) {
-  const settings = await loadTrustSettings();
-  if (!settings.projectDenied[projectPath]) {
-    settings.projectDenied[projectPath] = [];
+  const projectSettings = await loadProjectTrustSettings(projectPath);
+  if (!projectSettings.denied.includes(toolName)) {
+    projectSettings.denied.push(toolName);
   }
-  const denied = settings.projectDenied[projectPath];
-  if (denied && !denied.includes(toolName)) {
-    denied.push(toolName);
-  }
-  const projectTrusted = settings.projectTrusted[projectPath];
-  if (projectTrusted) {
-    settings.projectTrusted[projectPath] = projectTrusted.filter((t) => t !== toolName);
-  }
-  await saveTrustSettings(settings);
+  projectSettings.trusted = projectSettings.trusted.filter((t) => t !== toolName);
+  await saveProjectTrustSettings(projectPath, projectSettings);
 }
 async function removeDeniedTool(toolName, projectPath) {
-  const settings = await loadTrustSettings();
-  const denied = settings.projectDenied[projectPath];
-  if (denied) {
-    settings.projectDenied[projectPath] = denied.filter((t) => t !== toolName);
-  }
-  await saveTrustSettings(settings);
+  const projectSettings = await loadProjectTrustSettings(projectPath);
+  projectSettings.denied = projectSettings.denied.filter((t) => t !== toolName);
+  await saveProjectTrustSettings(projectPath, projectSettings);
 }
 async function getDeniedTools(projectPath) {
-  const settings = await loadTrustSettings();
-  return settings.projectDenied[projectPath] ?? [];
+  const settings = await loadProjectTrustSettings(projectPath);
+  return settings.denied;
 }
 async function getAllTrustedTools(projectPath) {
-  const settings = await loadTrustSettings();
+  const [settings, projectSettings] = await Promise.all([
+    loadTrustSettings(),
+    loadProjectTrustSettings(projectPath)
+  ]);
   return {
     global: settings.globalTrusted,
-    project: settings.projectTrusted[projectPath] ?? [],
-    denied: settings.projectDenied[projectPath] ?? []
+    project: projectSettings.trusted,
+    denied: projectSettings.denied
   };
 }
 async function initializeSessionTrust(session) {
@@ -10614,7 +10724,7 @@ function getSessionMemory(session) {
 async function reloadSessionMemory(session) {
   await initializeSessionMemory(session);
 }
-var MAX_SKILL_INSTRUCTIONS_CHARS, TRUST_SETTINGS_DIR, TRUST_SETTINGS_FILE, CATEGORY_LABELS, COCO_SYSTEM_PROMPT, SHELL_METACHARACTERS, SAFE_COMMAND_VALIDATORS;
+var MAX_SKILL_INSTRUCTIONS_CHARS, TRUST_SETTINGS_DIR, TRUST_SETTINGS_FILE, PROJECT_TRUST_FILE_RELATIVE_PATH, CATEGORY_LABELS, COCO_SYSTEM_PROMPT, SHELL_METACHARACTERS, SAFE_COMMAND_VALIDATORS;
 var init_session = __esm({
   "src/cli/repl/session.ts"() {
     init_env();
@@ -10629,6 +10739,7 @@ var init_session = __esm({
     MAX_SKILL_INSTRUCTIONS_CHARS = 16e3;
     TRUST_SETTINGS_DIR = path39__default.dirname(CONFIG_PATHS.trustedTools);
     TRUST_SETTINGS_FILE = CONFIG_PATHS.trustedTools;
+    PROJECT_TRUST_FILE_RELATIVE_PATH = path39__default.join(".coco", "trusted-tools.json");
     CATEGORY_LABELS = {
       mcp: "MCP Connected Services",
       file: "File Operations",
@@ -21620,7 +21731,7 @@ async function openBrowser2(url) {
   }
   for (const { cmd, args } of commands2) {
     try {
-      await execFileAsync2(cmd, args);
+      await execFileAsync3(cmd, args);
       return true;
     } catch {
       continue;
@@ -21896,13 +22007,13 @@ async function authenticateMcpOAuth(params) {
   await persistToken(resource, token, { authorizationServer, clientId });
   return token.access_token;
 }
-var execFileAsync2, TOKEN_STORE_PATH, OAUTH_TIMEOUT_MS, logger;
+var execFileAsync3, TOKEN_STORE_PATH, OAUTH_TIMEOUT_MS, logger;
 var init_oauth2 = __esm({
   "src/mcp/oauth.ts"() {
     init_callback_server();
     init_paths();
     init_logger();
-    execFileAsync2 = promisify(execFile);
+    execFileAsync3 = promisify(execFile);
     TOKEN_STORE_PATH = path39__default.join(CONFIG_PATHS.tokens, "mcp-oauth.json");
     OAUTH_TIMEOUT_MS = 5 * 60 * 1e3;
     logger = getLogger();
@@ -29123,20 +29234,13 @@ var PROVIDER_DEFINITIONS = {
     },
     // Updated: March 2026 — from platform.openai.com/docs/models
     models: [
-      {
-        id: "gpt-5.4-codex",
-        name: "GPT-5.4 Codex",
-        description: "Latest agentic coding model (Mar 2026)",
-        contextWindow: 4e5,
-        maxOutputTokens: 128e3,
-        recommended: true
-      },
       {
         id: "gpt-5.3-codex",
         name: "GPT-5.3 Codex",
-        description: "Previous agentic coding model (Feb 2026)",
+        description: "Latest available agentic coding model",
         contextWindow: 4e5,
-        maxOutputTokens: 128e3
+        maxOutputTokens: 128e3,
+        recommended: true
       },
       {
         id: "gpt-5.2-codex",
@@ -29437,20 +29541,13 @@ var PROVIDER_DEFINITIONS = {
       vision: true
     },
     models: [
-      {
-        id: "gpt-5.4-codex",
-        name: "GPT-5.4 Codex",
-        description: "Latest coding model via ChatGPT subscription (Mar 2026)",
-        contextWindow: 2e5,
-        maxOutputTokens: 128e3,
-        recommended: true
-      },
       {
         id: "gpt-5.3-codex",
         name: "GPT-5.3 Codex",
-        description: "Previous coding model via ChatGPT subscription",
+        description: "Latest available coding model via ChatGPT subscription",
         contextWindow: 2e5,
-        maxOutputTokens: 128e3
+        maxOutputTokens: 128e3,
+        recommended: true
       },
       {
         id: "gpt-5.2-codex",
@@ -29560,13 +29657,27 @@ var PROVIDER_DEFINITIONS = {
     },
     models: [
       {
-        id: "gemini-2.5-pro",
-        name: "Gemini 2.5 Pro",
-        description: "Recommended Vertex model for coding and complex reasoning",
+        id: "gemini-3-pro-preview",
+        name: "Gemini 3 Pro (Preview)",
+        description: "Most capable Vertex Gemini 3 model (preview)",
         contextWindow: 1048576,
         maxOutputTokens: 65536,
         recommended: true
       },
+      {
+        id: "gemini-3-flash-preview",
+        name: "Gemini 3 Flash (Preview)",
+        description: "Fast Gemini 3 model on Vertex (preview)",
+        contextWindow: 1048576,
+        maxOutputTokens: 65536
+      },
+      {
+        id: "gemini-2.5-pro",
+        name: "Gemini 2.5 Pro",
+        description: "Stable high-quality Vertex model for coding and complex reasoning",
+        contextWindow: 1048576,
+        maxOutputTokens: 65536
+      },
       {
         id: "gemini-2.5-flash",
         name: "Gemini 2.5 Flash",
@@ -33847,10 +33958,13 @@ async function selectModelInteractively(models, currentModelId) {
           totalLines++;
         }
         const star = model.recommended ? " \u2B50" : "";
-        const ctx = model.contextWindow ? ` ${Math.round(model.contextWindow / 1e3)}K` : "";
+        const multiplierMatch = model.description?.match(
+          /\b(?:Premium|Free)\s*x([0-9]+(?:\.[0-9]+)?)\b/i
+        );
+        const metric = multiplierMatch ? ` x${multiplierMatch[1]}` : model.contextWindow ? ` ${Math.round(model.contextWindow / 1e3)}K` : "";
         const desc = model.description ? `  ${model.description}` : "";
         const hint = model.hint ? `  \u2192 ${model.hint}` : "";
-        const suffix = truncate2(`${star}${ctx}${desc}${hint}`, descWidth, "\u2026");
+        const suffix = truncate2(`${star}${metric}${desc}${hint}`, descWidth, "\u2026");
         if (model.disabled) {
           let line2 = chalk.dim("   \u25CB ");
           line2 += chalk.dim(model.id.padEnd(30));
@@ -34173,7 +34287,10 @@ async function setupProviderWithAuth(provider) {
     authMethod = choice;
   }
   if (authMethod === "oauth") {
+    const oauthSpinner = p26.spinner();
+    oauthSpinner.start("Starting OAuth sign-in flow...");
     const result = await runOAuthFlow(provider.id);
+    oauthSpinner.stop(result ? "OAuth sign-in completed" : "OAuth sign-in cancelled");
     if (!result) return null;
     if (provider.id === "copilot") {
       const model3 = await selectModel(provider);
@@ -34257,7 +34374,10 @@ async function setupGcloudADC(provider) {
   );
   console.log(chalk.magenta("   \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F"));
   console.log();
+  const gcloudCheckSpinner = p26.spinner();
+  gcloudCheckSpinner.start("Checking gcloud CLI...");
   const gcloudInstalled = await isGcloudInstalled();
+  gcloudCheckSpinner.stop(gcloudInstalled ? "gcloud CLI detected" : "gcloud CLI not detected");
   if (!gcloudInstalled) {
     p26.log.error("gcloud CLI is not installed");
     console.log(chalk.dim("   Install it from: https://cloud.google.com/sdk/docs/install"));
@@ -34288,7 +34408,12 @@ async function setupGcloudADC(provider) {
       location: vertexSettings2?.location
     };
   }
+  const adcInspectSpinner = p26.spinner();
+  adcInspectSpinner.start("Checking existing ADC credentials...");
   let adc = await inspectADC();
+  adcInspectSpinner.stop(
+    adc.status === "ok" && adc.token ? "ADC credentials found" : "No reusable ADC credentials found"
+  );
   if (adc.status === "ok" && adc.token) {
     console.log(chalk.green("   \u2713 gcloud ADC is already configured!"));
     console.log();
@@ -34318,9 +34443,17 @@ async function setupGcloudADC(provider) {
   if (p26.isCancel(runLoginNow)) return null;
   if (runLoginNow) {
     p26.log.step("Running `gcloud auth application-default login`...");
+    const loginSpinner = p26.spinner();
+    loginSpinner.start("Launching gcloud login flow (browser may open)...");
     const loginOk = await runGcloudADCLogin();
+    loginSpinner.stop(loginOk ? "gcloud login flow completed" : "gcloud login flow failed");
     if (loginOk) {
+      const recheckSpinner = p26.spinner();
+      recheckSpinner.start("Verifying ADC credentials after login...");
       adc = await inspectADC();
+      recheckSpinner.stop(
+        adc.status === "ok" && adc.token ? "ADC credentials verified" : "ADC verification failed after login"
+      );
       if (adc.status === "ok" && adc.token) {
         console.log(chalk.green("   \u2713 gcloud ADC is now configured."));
         console.log();
@@ -35448,9 +35581,15 @@ async function switchProvider(initialProvider, session) {
   const oauthProviderName = newProvider.id === "copilot" ? "copilot" : newProvider.id === "gemini" ? "gemini" : "openai";
   let oauthConnected = false;
   if (hasOAuth) {
+    const oauthCheckSpinner = p26.spinner();
+    oauthCheckSpinner.start("Checking existing OAuth session...");
     try {
       oauthConnected = await isOAuthConfigured(oauthProviderName);
+      oauthCheckSpinner.stop(
+        oauthConnected ? "Existing OAuth session found" : "No existing OAuth session"
+      );
     } catch {
+      oauthCheckSpinner.stop("Could not verify OAuth session");
     }
   }
   {
@@ -35517,159 +35656,103 @@ async function switchProvider(initialProvider, session) {
       label: "\u274C Cancel",
       hint: ""
     });
+    let authChoice;
     if (authOptions.length > 2) {
-      const authChoice = await p26.select({
+      const selected = await p26.select({
         message: `How would you like to authenticate with ${newProvider.name}?`,
         options: authOptions
       });
-      if (p26.isCancel(authChoice) || authChoice === "cancel") {
+      if (p26.isCancel(selected) || selected === "cancel") {
         return false;
       }
-      if (authChoice === "oauth") {
-        const isCopilot = newProvider.id === "copilot";
-        const isGemini = newProvider.id === "gemini";
-        if (isCopilot) {
-          if (oauthConnected) {
-            console.log(chalk.dim(`
+      authChoice = selected;
+    } else {
+      authChoice = authOptions.find((option) => option.value !== "cancel")?.value ?? "cancel";
+      if (authChoice === "cancel") return false;
+    }
+    if (authChoice === "oauth") {
+      const isCopilot = newProvider.id === "copilot";
+      const isGemini = newProvider.id === "gemini";
+      if (isCopilot) {
+        if (oauthConnected) {
+          console.log(chalk.dim(`
 Using existing GitHub session...`));
-          } else {
-            const result = await runOAuthFlow("copilot");
-            if (!result) return false;
-          }
-          selectedAuthMethod = "oauth";
         } else {
-          const tokenEnvVar = isGemini ? "GEMINI_OAUTH_TOKEN" : "OPENAI_CODEX_TOKEN";
-          if (oauthConnected) {
-            try {
-              const tokenResult = await getOrRefreshOAuthToken(oauthProviderName);
-              if (tokenResult) {
-                process.env[tokenEnvVar] = tokenResult.accessToken;
-                selectedAuthMethod = "oauth";
-                if (!isGemini) internalProviderId = "codex";
-                console.log(chalk.dim(`
+          const oauthStartSpinner = p26.spinner();
+          oauthStartSpinner.start("Starting GitHub OAuth sign-in...");
+          const result = await runOAuthFlow("copilot");
+          oauthStartSpinner.stop(
+            result ? "GitHub OAuth sign-in completed" : "GitHub OAuth sign-in cancelled"
+          );
+          if (!result) return false;
+        }
+        selectedAuthMethod = "oauth";
+      } else {
+        const tokenEnvVar = isGemini ? "GEMINI_OAUTH_TOKEN" : "OPENAI_CODEX_TOKEN";
+        if (oauthConnected) {
+          const refreshSpinner = p26.spinner();
+          refreshSpinner.start("Refreshing existing OAuth session...");
+          try {
+            const tokenResult = await getOrRefreshOAuthToken(oauthProviderName);
+            if (tokenResult) {
+              process.env[tokenEnvVar] = tokenResult.accessToken;
+              selectedAuthMethod = "oauth";
+              if (!isGemini) internalProviderId = "codex";
+              refreshSpinner.stop("OAuth session ready");
+              console.log(chalk.dim(`
 Using existing OAuth session...`));
-              } else {
-                const result = await runOAuthFlow(newProvider.id);
-                if (!result) return false;
-                process.env[tokenEnvVar] = result.accessToken;
-                selectedAuthMethod = "oauth";
-                if (!isGemini) internalProviderId = "codex";
-              }
-            } catch {
+            } else {
+              refreshSpinner.stop("OAuth refresh failed, re-authentication required");
+              const oauthStartSpinner = p26.spinner();
+              oauthStartSpinner.start("Starting OAuth sign-in...");
               const result = await runOAuthFlow(newProvider.id);
+              oauthStartSpinner.stop(
+                result ? "OAuth sign-in completed" : "OAuth sign-in cancelled"
+              );
               if (!result) return false;
               process.env[tokenEnvVar] = result.accessToken;
               selectedAuthMethod = "oauth";
               if (!isGemini) internalProviderId = "codex";
             }
-          } else {
+          } catch {
+            refreshSpinner.stop("OAuth refresh failed, re-authentication required");
+            const oauthStartSpinner = p26.spinner();
+            oauthStartSpinner.start("Starting OAuth sign-in...");
             const result = await runOAuthFlow(newProvider.id);
+            oauthStartSpinner.stop(result ? "OAuth sign-in completed" : "OAuth sign-in cancelled");
             if (!result) return false;
             process.env[tokenEnvVar] = result.accessToken;
             selectedAuthMethod = "oauth";
             if (!isGemini) internalProviderId = "codex";
           }
-        }
-      } else if (authChoice === "gcloud") {
-        const adcResult = await setupGcloudADCForProvider();
-        if (!adcResult) return false;
-        selectedAuthMethod = "gcloud";
-        if (newProvider.id === "vertex") {
-          const settings = await promptVertexSettings2({
-            project: session.config.provider.project,
-            location: session.config.provider.location
-          });
-          if (!settings) return false;
-          vertexSettings = settings;
-        }
-      } else if (authChoice === "apikey") {
-        if (apiKey) {
-          selectedAuthMethod = "apikey";
-          console.log(chalk.dim(`
-Using existing API key...`));
         } else {
-          const key = await p26.password({
-            message: `Enter your ${newProvider.name} API key:`,
-            validate: (v) => !v || v.length < 10 ? "API key too short" : void 0
-          });
-          if (p26.isCancel(key)) {
-            return false;
-          }
-          process.env[newProvider.envVar] = key;
-          selectedAuthMethod = "apikey";
-          newApiKeyForSaving = key;
-        }
-        if (newProvider.id === "vertex") {
-          const settings = await promptVertexSettings2({
-            project: session.config.provider.project,
-            location: session.config.provider.location
-          });
-          if (!settings) return false;
-          vertexSettings = settings;
-        }
-      } else if (authChoice === "remove") {
-        const removeOptions = [];
-        if (oauthConnected) {
-          removeOptions.push({
-            value: "oauth",
-            label: "\u{1F510} Remove OAuth session"
-          });
-        }
-        if (apiKey) {
-          removeOptions.push({
-            value: "apikey",
-            label: "\u{1F511} Remove API key"
-          });
-        }
-        if (oauthConnected && apiKey) {
-          removeOptions.push({
-            value: "all",
-            label: "\u{1F5D1}\uFE0F  Remove all credentials"
-          });
+          const oauthStartSpinner = p26.spinner();
+          oauthStartSpinner.start("Starting OAuth sign-in...");
+          const result = await runOAuthFlow(newProvider.id);
+          oauthStartSpinner.stop(result ? "OAuth sign-in completed" : "OAuth sign-in cancelled");
+          if (!result) return false;
+          process.env[tokenEnvVar] = result.accessToken;
+          selectedAuthMethod = "oauth";
+          if (!isGemini) internalProviderId = "codex";
         }
-        removeOptions.push({
-          value: "cancel",
-          label: "\u274C Cancel"
-        });
-        const removeChoice = await p26.select({
-          message: "What would you like to remove?",
-          options: removeOptions
+      }
+    } else if (authChoice === "gcloud") {
+      const adcResult = await setupGcloudADCForProvider();
+      if (!adcResult) return false;
+      selectedAuthMethod = "gcloud";
+      if (newProvider.id === "vertex") {
+        const settings = await promptVertexSettings2({
+          project: session.config.provider.project,
+          location: session.config.provider.location
         });
-        if (p26.isCancel(removeChoice) || removeChoice === "cancel") {
-          return false;
-        }
-        if (removeChoice === "oauth" || removeChoice === "all") {
-          if (oauthProviderName === "copilot") {
-            await deleteCopilotCredentials();
-          } else {
-            await deleteTokens(oauthProviderName);
-          }
-          await clearAuthMethod(newProvider.id);
-          console.log(chalk.green("\u2713 OAuth session removed"));
-        }
-        if (removeChoice === "apikey" || removeChoice === "all") {
-          delete process.env[newProvider.envVar];
-          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`));
-        }
-        console.log("");
-        return false;
+        if (!settings) return false;
+        vertexSettings = settings;
       }
-    } else {
-      console.log(chalk.yellow(`
-${newProvider.emoji} ${newProvider.name} is not configured.`));
-      if (hasGcloudADC && !supportsApiKey) {
-        const adcResult = await setupGcloudADCForProvider();
-        if (!adcResult) return false;
-        selectedAuthMethod = "gcloud";
-        if (newProvider.id === "vertex") {
-          const settings = await promptVertexSettings2({
-            project: session.config.provider.project,
-            location: session.config.provider.location
-          });
-          if (!settings) return false;
-          vertexSettings = settings;
-        }
+    } else if (authChoice === "apikey") {
+      if (apiKey) {
+        selectedAuthMethod = "apikey";
+        console.log(chalk.dim(`
+Using existing API key...`));
       } else {
         const key = await p26.password({
           message: `Enter your ${newProvider.name} API key:`,
@@ -35682,18 +35765,75 @@ ${newProvider.emoji} ${newProvider.name} is not configured.`));
         selectedAuthMethod = "apikey";
         newApiKeyForSaving = key;
       }
+      if (newProvider.id === "vertex") {
+        const settings = await promptVertexSettings2({
+          project: session.config.provider.project,
+          location: session.config.provider.location
+        });
+        if (!settings) return false;
+        vertexSettings = settings;
+      }
+    } else if (authChoice === "remove") {
+      const removeOptions = [];
+      if (oauthConnected) {
+        removeOptions.push({
+          value: "oauth",
+          label: "\u{1F510} Remove OAuth session"
+        });
+      }
+      if (apiKey) {
+        removeOptions.push({
+          value: "apikey",
+          label: "\u{1F511} Remove API key"
+        });
+      }
+      if (oauthConnected && apiKey) {
+        removeOptions.push({
+          value: "all",
+          label: "\u{1F5D1}\uFE0F  Remove all credentials"
+        });
+      }
+      removeOptions.push({
+        value: "cancel",
+        label: "\u274C Cancel"
+      });
+      const removeChoice = await p26.select({
+        message: "What would you like to remove?",
+        options: removeOptions
+      });
+      if (p26.isCancel(removeChoice) || removeChoice === "cancel") {
+        return false;
+      }
+      if (removeChoice === "oauth" || removeChoice === "all") {
+        if (oauthProviderName === "copilot") {
+          await deleteCopilotCredentials();
+        } else {
+          await deleteTokens(oauthProviderName);
+        }
+        await clearAuthMethod(newProvider.id);
+        console.log(chalk.green("\u2713 OAuth session removed"));
+      }
+      if (removeChoice === "apikey" || removeChoice === "all") {
+        delete process.env[newProvider.envVar];
+        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`));
+      }
+      console.log("");
+      return false;
     }
   }
   const rememberedModel = await getLastUsedModel(newProvider.id);
   const recommendedModel = getRecommendedModel(newProvider.id);
   const 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();
   spinner18.start(`Connecting to ${newProvider.name}...`);
   try {
     const testProvider = await createProvider(internalProviderId, {
       model: newModel,
-      project: vertexSettings?.project,
-      location: vertexSettings?.location
+      project: resolvedVertexProject,
+      location: resolvedVertexLocation
     });
     const available = await testProvider.isAvailable();
     if (!available) {
@@ -35707,8 +35847,14 @@ ${newProvider.emoji} ${newProvider.name} is not configured.`));
     session.config.provider.type = userFacingProviderId;
     session.config.provider.model = newModel;
     if (userFacingProviderId === "vertex") {
-      session.config.provider.project = vertexSettings?.project;
-      session.config.provider.location = vertexSettings?.location;
+      session.config.provider.project = resolvedVertexProject;
+      session.config.provider.location = resolvedVertexLocation;
+      if (resolvedVertexProject) {
+        process.env["VERTEX_PROJECT"] = resolvedVertexProject;
+      }
+      if (resolvedVertexLocation) {
+        process.env["VERTEX_LOCATION"] = resolvedVertexLocation;
+      }
     } else {
       delete session.config.provider.project;
       delete session.config.provider.location;
@@ -35718,13 +35864,13 @@ ${newProvider.emoji} ${newProvider.name} is not configured.`));
         type: userFacingProviderId,
         model: newModel,
         apiKey: newApiKeyForSaving,
-        project: vertexSettings?.project,
-        location: vertexSettings?.location
+        project: resolvedVertexProject,
+        location: resolvedVertexLocation
       });
     } else {
       await saveProviderPreference(userFacingProviderId, newModel, {
-        project: vertexSettings?.project,
-        location: vertexSettings?.location
+        project: resolvedVertexProject,
+        location: resolvedVertexLocation
       });
     }
     console.log(chalk.green(`
@@ -35747,13 +35893,21 @@ ${newProvider.emoji} ${newProvider.name} is not configured.`));
   return false;
 }
 async function setupGcloudADCForProvider(_provider) {
+  const gcloudCheckSpinner = p26.spinner();
+  gcloudCheckSpinner.start("Checking gcloud CLI...");
   const gcloudInstalled = await isGcloudInstalled();
+  gcloudCheckSpinner.stop(gcloudInstalled ? "gcloud CLI detected" : "gcloud CLI not detected");
   if (!gcloudInstalled) {
     p26.log.error("gcloud CLI is not installed");
     console.log(chalk.dim("   Install it from: https://cloud.google.com/sdk/docs/install\n"));
     return false;
   }
+  const adcInspectSpinner = p26.spinner();
+  adcInspectSpinner.start("Checking existing ADC credentials...");
   const adc = await inspectADC();
+  adcInspectSpinner.stop(
+    adc.status === "ok" && adc.token ? "ADC credentials found" : "No reusable ADC credentials found"
+  );
   if (adc.status === "ok" && adc.token) {
     console.log(chalk.green("   \u2713 gcloud ADC is already configured!\n"));
     return true;
@@ -35769,9 +35923,17 @@ async function setupGcloudADCForProvider(_provider) {
   if (p26.isCancel(runLoginNow)) return false;
   if (runLoginNow) {
     p26.log.step("Running `gcloud auth application-default login`...");
+    const loginSpinner = p26.spinner();
+    loginSpinner.start("Launching gcloud login flow (browser may open)...");
     const loginOk = await runGcloudADCLogin();
+    loginSpinner.stop(loginOk ? "gcloud login flow completed" : "gcloud login flow failed");
     if (loginOk) {
+      const recheckSpinner = p26.spinner();
+      recheckSpinner.start("Verifying ADC credentials after login...");
       const refreshed = await inspectADC();
+      recheckSpinner.stop(
+        refreshed.status === "ok" && refreshed.token ? "ADC credentials verified" : "ADC verification failed after login"
+      );
       if (refreshed.status === "ok" && refreshed.token) {
         console.log(chalk.green("   \u2713 gcloud ADC is now configured.\n"));
         return true;
@@ -39044,10 +39206,8 @@ async function revokePath(dirPath, _session) {
 
 // src/cli/repl/commands/permissions.ts
 init_session();
-init_paths();
 
 // src/cli/repl/recommended-permissions.ts
-init_paths();
 init_session();
 var RECOMMENDED_GLOBAL = [
   // ── Coco native tools (read-only) ──
@@ -39383,100 +39543,94 @@ var RECOMMENDED_DENY = [
   "bash:eval",
   "bash:source"
 ];
-function getProjectPreferenceKey(projectPath) {
-  return path39__default.resolve(projectPath);
+function getProjectPermissionStatePath(projectPath) {
+  return path39__default.join(projectPath, ".coco", "recommended-permissions.json");
 }
-async function loadPermissionPreferences() {
+async function resolvePermissionScopePath(projectPath) {
+  let resolved = path39__default.resolve(projectPath);
   try {
-    const content = await fs35__default.readFile(CONFIG_PATHS.config, "utf-8");
-    const config = JSON.parse(content);
-    return {
-      recommendedAllowlistApplied: config.recommendedAllowlistApplied,
-      recommendedAllowlistDismissed: config.recommendedAllowlistDismissed,
-      recommendedAllowlistPrompted: config.recommendedAllowlistPrompted,
-      recommendedAllowlistPromptedProjects: config.recommendedAllowlistPromptedProjects,
-      recommendedAllowlistAppliedProjects: config.recommendedAllowlistAppliedProjects,
-      recommendedAllowlistDismissedProjects: config.recommendedAllowlistDismissedProjects
-    };
+    resolved = await fs35__default.realpath(resolved);
   } catch {
-    return {};
   }
-}
-async function savePermissionPreference(key, value) {
-  try {
-    let config = {};
+  let current = resolved;
+  while (true) {
     try {
-      const content = await fs35__default.readFile(CONFIG_PATHS.config, "utf-8");
-      config = JSON.parse(content);
+      await fs35__default.access(path39__default.join(current, ".git"));
+      return current;
     } catch {
     }
-    config[key] = value;
-    await fs35__default.mkdir(path39__default.dirname(CONFIG_PATHS.config), { recursive: true });
-    await fs35__default.writeFile(CONFIG_PATHS.config, JSON.stringify(config, null, 2), "utf-8");
-  } catch {
+    const parent = path39__default.dirname(current);
+    if (parent === current) break;
+    current = parent;
   }
+  return resolved;
 }
-function isRecommendedAllowlistAppliedForProject(prefs, projectPath) {
-  const projectKey = getProjectPreferenceKey(projectPath);
-  if (prefs.recommendedAllowlistAppliedProjects?.[projectKey] === true) {
-    return true;
-  }
-  if (prefs.recommendedAllowlistApplied === true && !prefs.recommendedAllowlistAppliedProjects) {
-    return true;
-  }
-  return false;
-}
-function isRecommendedAllowlistDismissedForProject(prefs, projectPath) {
-  const projectKey = getProjectPreferenceKey(projectPath);
-  if (prefs.recommendedAllowlistDismissedProjects?.[projectKey] === true) {
-    return true;
-  }
-  if (prefs.recommendedAllowlistDismissed === true && !prefs.recommendedAllowlistDismissedProjects) {
-    return true;
+async function loadProjectPermissionState(projectPath) {
+  const defaultState = {
+    applied: false,
+    dismissed: false,
+    prompted: false,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  try {
+    const content = await fs35__default.readFile(getProjectPermissionStatePath(projectPath), "utf-8");
+    const parsed = JSON.parse(content);
+    return {
+      applied: parsed.applied ?? defaultState.applied,
+      dismissed: parsed.dismissed ?? defaultState.dismissed,
+      prompted: parsed.prompted ?? defaultState.prompted,
+      updatedAt: parsed.updatedAt ?? defaultState.updatedAt
+    };
+  } catch {
+    return defaultState;
   }
-  return false;
 }
-async function saveProjectPermissionPreference(key, projectPath, value) {
+async function saveProjectPermissionState(projectPath, update) {
   try {
-    let config = {};
-    try {
-      const content = await fs35__default.readFile(CONFIG_PATHS.config, "utf-8");
-      config = JSON.parse(content);
-    } catch {
-    }
-    const projectKey = getProjectPreferenceKey(projectPath);
-    const currentMap = config[key] ?? {};
-    config[key] = {
-      ...currentMap,
-      [projectKey]: value
+    const current = await loadProjectPermissionState(projectPath);
+    const next = {
+      ...current,
+      ...update,
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await fs35__default.mkdir(path39__default.dirname(CONFIG_PATHS.config), { recursive: true });
-    await fs35__default.writeFile(CONFIG_PATHS.config, JSON.stringify(config, null, 2), "utf-8");
+    const filePath = getProjectPermissionStatePath(projectPath);
+    await fs35__default.mkdir(path39__default.dirname(filePath), { recursive: true });
+    await fs35__default.writeFile(filePath, JSON.stringify(next, null, 2), "utf-8");
   } catch {
   }
 }
+async function getProjectPermissionState(projectPath) {
+  const scopePath = await resolvePermissionScopePath(projectPath);
+  return loadProjectPermissionState(scopePath);
+}
+async function saveProjectPermissionPreference(key, projectPath, value) {
+  const scopePath = await resolvePermissionScopePath(projectPath);
+  if (key === "recommendedAllowlistAppliedProjects") {
+    await saveProjectPermissionState(scopePath, { applied: value });
+    return;
+  }
+  await saveProjectPermissionState(scopePath, { dismissed: value });
+}
 async function shouldShowPermissionSuggestion(projectPath = process.cwd()) {
-  const prefs = await loadPermissionPreferences();
-  if (isRecommendedAllowlistDismissedForProject(prefs, projectPath)) {
+  const state = await getProjectPermissionState(projectPath);
+  if (state.dismissed) {
     return false;
   }
-  if (isRecommendedAllowlistAppliedForProject(prefs, projectPath)) {
+  if (state.applied) {
     return false;
   }
   return true;
 }
 async function applyRecommendedPermissions(projectPath = process.cwd()) {
+  const scopePath = await resolvePermissionScopePath(projectPath);
   for (const tool of [...RECOMMENDED_GLOBAL, ...RECOMMENDED_PROJECT]) {
     await saveTrustedTool(tool, projectPath, false);
   }
-  await saveProjectPermissionPreference("recommendedAllowlistAppliedProjects", projectPath, true);
-  await saveProjectPermissionPreference(
-    "recommendedAllowlistDismissedProjects",
-    projectPath,
-    false
-  );
+  await saveProjectPermissionPreference("recommendedAllowlistAppliedProjects", scopePath, true);
+  await saveProjectPermissionPreference("recommendedAllowlistDismissedProjects", scopePath, false);
 }
 async function showPermissionSuggestion(projectPath = process.cwd()) {
+  const scopePath = await resolvePermissionScopePath(projectPath);
   console.log();
   console.log(chalk.magenta.bold("  \u{1F4CB} Recommended Permissions"));
   console.log();
@@ -39487,7 +39641,7 @@ async function showPermissionSuggestion(projectPath = process.cwd()) {
   );
   console.log(chalk.dim("  \u2022 Deny: sudo, git push, docker push, inline code exec, DNS exfil..."));
   console.log();
-  console.log(chalk.dim("  Stored in ~/.coco/trusted-tools.json \u2014 edit manually or let"));
+  console.log(chalk.dim("  Stored in .coco/trusted-tools.json \u2014 edit manually or let"));
   console.log(chalk.dim("  Coco manage it when you approve actions from the prompt."));
   console.log(chalk.dim("  Note: applying here affects only the current project."));
   console.log();
@@ -39508,11 +39662,7 @@ async function showPermissionSuggestion(projectPath = process.cwd()) {
     return;
   }
   if (action === "dismiss") {
-    await saveProjectPermissionPreference(
-      "recommendedAllowlistDismissedProjects",
-      projectPath,
-      true
-    );
+    await saveProjectPermissionPreference("recommendedAllowlistDismissedProjects", scopePath, true);
     console.log(chalk.dim("  Won't show again. Use /permissions to apply later."));
     return;
   }
@@ -39612,12 +39762,12 @@ var permissionsCommand = {
 };
 async function showStatus(session) {
   const tools = await getAllTrustedTools(session.projectPath);
-  const prefs = await loadPermissionPreferences();
+  const permissionState = await getProjectPermissionState(session.projectPath);
   console.log();
   console.log(chalk.magenta.bold("  \u{1F510} Tool Permissions"));
   console.log();
   const allowCount = RECOMMENDED_GLOBAL.length + RECOMMENDED_PROJECT.length;
-  if (isRecommendedAllowlistAppliedForProject(prefs, session.projectPath)) {
+  if (permissionState.applied) {
     console.log(
       chalk.green("  \u2713 Recommended allowlist applied") + chalk.dim(` (${allowCount} allow, ${RECOMMENDED_DENY.length} deny)`)
     );
@@ -39698,25 +39848,26 @@ async function resetPermissions(session) {
     return;
   }
   session.trustedTools.clear();
-  const emptySettings = {
-    globalTrusted: [],
-    projectTrusted: {},
-    projectDenied: {},
+  const emptyProjectSettings = {
+    trusted: [],
+    denied: [],
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   try {
-    await fs35__default.writeFile(CONFIG_PATHS.trustedTools, JSON.stringify(emptySettings, null, 2), "utf-8");
+    const projectTrustPath = `${session.projectPath}/.coco/trusted-tools.json`;
+    await fs35__default.mkdir(`${session.projectPath}/.coco`, { recursive: true });
+    await fs35__default.writeFile(projectTrustPath, JSON.stringify(emptyProjectSettings, null, 2), "utf-8");
   } catch {
   }
-  await savePermissionPreference("recommendedAllowlistApplied", false);
+  const permissionScopePath = session.projectPath;
   await saveProjectPermissionPreference(
     "recommendedAllowlistAppliedProjects",
-    session.projectPath,
+    permissionScopePath,
     false
   );
   await saveProjectPermissionPreference(
     "recommendedAllowlistDismissedProjects",
-    session.projectPath,
+    permissionScopePath,
     false
   );
   console.log(chalk.green("  \u2713 All tool permissions reset."));
@@ -43258,7 +43409,8 @@ var AgentManager = class extends EventEmitter {
         type: "tool_use",
         id: tc.id,
         name: tc.name,
-        input: tc.input
+        input: tc.input,
+        geminiThoughtSignature: tc.geminiThoughtSignature
       }));
       const assistantContent = response.content ? [{ type: "text", text: response.content }, ...toolUses] : toolUses;
       messages.push({ role: "assistant", content: assistantContent });
@@ -49171,7 +49323,7 @@ function buildProgressBar(pct) {
 
 // src/cli/repl/worktree/manager.ts
 init_logger();
-var execFileAsync3 = promisify(execFile);
+var execFileAsync4 = promisify(execFile);
 var WORKTREES_DIR = ".worktrees";
 var WorktreeManager = class {
   worktrees = /* @__PURE__ */ new Map();
@@ -49395,7 +49547,7 @@ var WorktreeManager = class {
     try {
       await this.git(["push", "-u", "origin", worktree.branch]);
       const title = options.message ?? `Agent: ${worktree.name}`;
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync4(
         "gh",
         [
           "pr",
@@ -49421,10 +49573,10 @@ var WorktreeManager = class {
   }
   // ── Helpers ──────────────────────────────────────────────────────
   async git(args) {
-    return execFileAsync3("git", args, { cwd: this.projectRoot });
+    return execFileAsync4("git", args, { cwd: this.projectRoot });
   }
   async gitIn(cwd, args) {
-    return execFileAsync3("git", args, { cwd });
+    return execFileAsync4("git", args, { cwd });
   }
   async countChangedFiles(branch) {
     try {
@@ -53054,7 +53206,8 @@ ${tail}`;
             toolCallBuilders.set(id, {
               id,
               name: toolName,
-              input: {}
+              input: {},
+              geminiThoughtSignature: chunk.toolCall.geminiThoughtSignature
             });
             if (toolName) {
               options.onToolPreparing?.(toolName);
@@ -53067,14 +53220,16 @@ ${tail}`;
               const finalToolCall = {
                 id: builder.id,
                 name: chunk.toolCall.name ?? builder.name,
-                input: chunk.toolCall.input ?? builder.input
+                input: chunk.toolCall.input ?? builder.input,
+                geminiThoughtSignature: chunk.toolCall.geminiThoughtSignature ?? builder.geminiThoughtSignature
               };
               collectedToolCalls.push(finalToolCall);
             } else if (chunk.toolCall.id && chunk.toolCall.name) {
               collectedToolCalls.push({
                 id: chunk.toolCall.id,
                 name: chunk.toolCall.name,
-                input: chunk.toolCall.input ?? {}
+                input: chunk.toolCall.input ?? {},
+                geminiThoughtSignature: chunk.toolCall.geminiThoughtSignature
               });
             }
           }
@@ -53331,7 +53486,8 @@ ${tail}`;
         type: "tool_use",
         id: toolCall.id,
         name: toolCall.name,
-        input: toolCall.input
+        input: toolCall.input,
+        geminiThoughtSignature: toolCall.geminiThoughtSignature
       });
       const declineReason = declinedTools.get(toolCall.id);
       if (declineReason) {
@@ -54115,11 +54271,15 @@ async function startRepl(options = {}) {
   }
   session.config = configured;
   const internalProviderId = getInternalProviderId(session.config.provider.type);
+  const initialVertexProject = session.config.provider.project ?? process.env["VERTEX_PROJECT"] ?? process.env["GOOGLE_CLOUD_PROJECT"] ?? process.env["GCLOUD_PROJECT"];
+  const initialVertexLocation = session.config.provider.location ?? process.env["VERTEX_LOCATION"] ?? process.env["GOOGLE_CLOUD_LOCATION"];
   let provider;
   try {
     provider = await createProvider(internalProviderId, {
       model: session.config.provider.model || void 0,
-      maxTokens: session.config.provider.maxTokens
+      maxTokens: session.config.provider.maxTokens,
+      project: initialVertexProject,
+      location: initialVertexLocation
     });
   } catch (error) {
     p26.log.error(
@@ -54504,7 +54664,9 @@ async function startRepl(options = {}) {
           const newInternalId = getInternalProviderId(session.config.provider.type);
           provider = await createProvider(newInternalId, {
             model: session.config.provider.model || void 0,
-            maxTokens: session.config.provider.maxTokens
+            maxTokens: session.config.provider.maxTokens,
+            project: session.config.provider.project ?? process.env["VERTEX_PROJECT"] ?? process.env["GOOGLE_CLOUD_PROJECT"] ?? process.env["GCLOUD_PROJECT"],
+            location: session.config.provider.location ?? process.env["VERTEX_LOCATION"] ?? process.env["GOOGLE_CLOUD_LOCATION"]
           });
           setAgentProvider(provider);
           initializeContextManager(session, provider);