@ainative/cody-cli 0.7.33 → 0.7.35

package/dist/cli.js

@@ -55467,7 +55467,7 @@ var init_PermissionMode = __esm(() => {
 });
 
 // src/entrypoints/sdk/coreSchemas.ts
-var ModelUsageSchema, OutputFormatTypeSchema, BaseOutputFormatSchema, JsonSchemaOutputFormatSchema, OutputFormatSchema, ApiKeySourceSchema, ConfigScopeSchema, SdkBetaSchema, ThinkingAdaptiveSchema, ThinkingEnabledSchema, ThinkingDisabledSchema, ThinkingConfigSchema, McpStdioServerConfigSchema, McpSSEServerConfigSchema, McpHttpServerConfigSchema, McpSdkServerConfigSchema, McpServerConfigForProcessTransportSchema, McpClaudeAIProxyServerConfigSchema, McpServerStatusConfigSchema, McpServerStatusSchema, McpSetServersResultSchema, PermissionUpdateDestinationSchema, PermissionBehaviorSchema, PermissionRuleValueSchema, PermissionUpdateSchema, PermissionDecisionClassificationSchema, PermissionResultSchema, PermissionModeSchema, HOOK_EVENTS, HookEventSchema, BaseHookInputSchema, PreToolUseHookInputSchema, PermissionRequestHookInputSchema, PostToolUseHookInputSchema, PostToolUseFailureHookInputSchema, PermissionDeniedHookInputSchema, NotificationHookInputSchema, UserPromptSubmitHookInputSchema, SessionStartHookInputSchema, SetupHookInputSchema, StopHookInputSchema, StopFailureHookInputSchema, SubagentStartHookInputSchema, SubagentStopHookInputSchema, PreCompactHookInputSchema, PostCompactHookInputSchema, TeammateIdleHookInputSchema, TaskCreatedHookInputSchema, TaskCompletedHookInputSchema, ElicitationHookInputSchema, ElicitationResultHookInputSchema, CONFIG_CHANGE_SOURCES, ConfigChangeHookInputSchema, INSTRUCTIONS_LOAD_REASONS, INSTRUCTIONS_MEMORY_TYPES, InstructionsLoadedHookInputSchema, WorktreeCreateHookInputSchema, WorktreeRemoveHookInputSchema, CwdChangedHookInputSchema, FileChangedHookInputSchema, EXIT_REASONS, ExitReasonSchema, SessionEndHookInputSchema, HookInputSchema, AsyncHookJSONOutputSchema, PreToolUseHookSpecificOutputSchema, UserPromptSubmitHookSpecificOutputSchema, SessionStartHookSpecificOutputSchema, SetupHookSpecificOutputSchema, SubagentStartHookSpecificOutputSchema, PostToolUseHookSpecificOutputSchema, PostToolUseFailureHookSpecificOutputSchema, PermissionDeniedHookSpecificOutputSchema, NotificationHookSpecificOutputSchema, PermissionRequestHookSpecificOutputSchema, CwdChangedHookSpecificOutputSchema, FileChangedHookSpecificOutputSchema, SyncHookJSONOutputSchema, ElicitationHookSpecificOutputSchema, ElicitationResultHookSpecificOutputSchema, WorktreeCreateHookSpecificOutputSchema, HookJSONOutputSchema, PromptRequestOptionSchema, PromptRequestSchema, PromptResponseSchema, SlashCommandSchema, AgentInfoSchema, ModelInfoSchema, AccountInfoSchema, AgentMcpServerSpecSchema, AgentDefinitionSchema, SettingSourceSchema, SdkPluginConfigSchema, RewindFilesResultSchema, APIUserMessagePlaceholder, APIAssistantMessagePlaceholder, RawMessageStreamEventPlaceholder, UUIDPlaceholder, NonNullableUsagePlaceholder, SDKAssistantMessageErrorSchema, SDKStatusSchema, SDKUserMessageContentSchema, SDKUserMessageSchema, SDKUserMessageReplaySchema, SDKRateLimitInfoSchema, SDKAssistantMessageSchema, SDKRateLimitEventSchema, SDKStreamlinedTextMessageSchema, SDKStreamlinedToolUseSummaryMessageSchema, SDKPermissionDenialSchema, SDKResultSuccessSchema, SDKResultErrorSchema, SDKResultMessageSchema, SDKSystemMessageSchema, SDKPartialAssistantMessageSchema, SDKCompactBoundaryMessageSchema, SDKStatusMessageSchema, SDKPostTurnSummaryMessageSchema, SDKAPIRetryMessageSchema, SDKLocalCommandOutputMessageSchema, SDKHookStartedMessageSchema, SDKHookProgressMessageSchema, SDKHookResponseMessageSchema, SDKToolProgressMessageSchema, SDKAuthStatusMessageSchema, SDKFilesPersistedEventSchema, SDKTaskNotificationMessageSchema, SDKTaskStartedMessageSchema, SDKSessionStateChangedMessageSchema, SDKTaskProgressMessageSchema, SDKToolUseSummaryMessageSchema, SDKElicitationCompleteMessageSchema, SDKPromptSuggestionMessageSchema, SDKSessionInfoSchema, SDKMessageSchema, FastModeStateSchema;
+var ModelUsageSchema, OutputFormatTypeSchema, BaseOutputFormatSchema, JsonSchemaOutputFormatSchema, OutputFormatSchema, ApiKeySourceSchema, ConfigScopeSchema, SdkBetaSchema, ThinkingAdaptiveSchema, ThinkingEnabledSchema, ThinkingDisabledSchema, ThinkingConfigSchema, McpStdioServerConfigSchema, McpSSEServerConfigSchema, McpHttpServerConfigSchema, McpSdkServerConfigSchema, McpServerConfigForProcessTransportSchema, McpAINativeProxyServerConfigSchema, McpServerStatusConfigSchema, McpServerStatusSchema, McpSetServersResultSchema, PermissionUpdateDestinationSchema, PermissionBehaviorSchema, PermissionRuleValueSchema, PermissionUpdateSchema, PermissionDecisionClassificationSchema, PermissionResultSchema, PermissionModeSchema, HOOK_EVENTS, HookEventSchema, BaseHookInputSchema, PreToolUseHookInputSchema, PermissionRequestHookInputSchema, PostToolUseHookInputSchema, PostToolUseFailureHookInputSchema, PermissionDeniedHookInputSchema, NotificationHookInputSchema, UserPromptSubmitHookInputSchema, SessionStartHookInputSchema, SetupHookInputSchema, StopHookInputSchema, StopFailureHookInputSchema, SubagentStartHookInputSchema, SubagentStopHookInputSchema, PreCompactHookInputSchema, PostCompactHookInputSchema, TeammateIdleHookInputSchema, TaskCreatedHookInputSchema, TaskCompletedHookInputSchema, ElicitationHookInputSchema, ElicitationResultHookInputSchema, CONFIG_CHANGE_SOURCES, ConfigChangeHookInputSchema, INSTRUCTIONS_LOAD_REASONS, INSTRUCTIONS_MEMORY_TYPES, InstructionsLoadedHookInputSchema, WorktreeCreateHookInputSchema, WorktreeRemoveHookInputSchema, CwdChangedHookInputSchema, FileChangedHookInputSchema, EXIT_REASONS, ExitReasonSchema, SessionEndHookInputSchema, HookInputSchema, AsyncHookJSONOutputSchema, PreToolUseHookSpecificOutputSchema, UserPromptSubmitHookSpecificOutputSchema, SessionStartHookSpecificOutputSchema, SetupHookSpecificOutputSchema, SubagentStartHookSpecificOutputSchema, PostToolUseHookSpecificOutputSchema, PostToolUseFailureHookSpecificOutputSchema, PermissionDeniedHookSpecificOutputSchema, NotificationHookSpecificOutputSchema, PermissionRequestHookSpecificOutputSchema, CwdChangedHookSpecificOutputSchema, FileChangedHookSpecificOutputSchema, SyncHookJSONOutputSchema, ElicitationHookSpecificOutputSchema, ElicitationResultHookSpecificOutputSchema, WorktreeCreateHookSpecificOutputSchema, HookJSONOutputSchema, PromptRequestOptionSchema, PromptRequestSchema, PromptResponseSchema, SlashCommandSchema, AgentInfoSchema, ModelInfoSchema, AccountInfoSchema, AgentMcpServerSpecSchema, AgentDefinitionSchema, SettingSourceSchema, SdkPluginConfigSchema, RewindFilesResultSchema, APIUserMessagePlaceholder, APIAssistantMessagePlaceholder, RawMessageStreamEventPlaceholder, UUIDPlaceholder, NonNullableUsagePlaceholder, SDKAssistantMessageErrorSchema, SDKStatusSchema, SDKUserMessageContentSchema, SDKUserMessageSchema, SDKUserMessageReplaySchema, SDKRateLimitInfoSchema, SDKAssistantMessageSchema, SDKRateLimitEventSchema, SDKStreamlinedTextMessageSchema, SDKStreamlinedToolUseSummaryMessageSchema, SDKPermissionDenialSchema, SDKResultSuccessSchema, SDKResultErrorSchema, SDKResultMessageSchema, SDKSystemMessageSchema, SDKPartialAssistantMessageSchema, SDKCompactBoundaryMessageSchema, SDKStatusMessageSchema, SDKPostTurnSummaryMessageSchema, SDKAPIRetryMessageSchema, SDKLocalCommandOutputMessageSchema, SDKHookStartedMessageSchema, SDKHookProgressMessageSchema, SDKHookResponseMessageSchema, SDKToolProgressMessageSchema, SDKAuthStatusMessageSchema, SDKFilesPersistedEventSchema, SDKTaskNotificationMessageSchema, SDKTaskStartedMessageSchema, SDKSessionStateChangedMessageSchema, SDKTaskProgressMessageSchema, SDKToolUseSummaryMessageSchema, SDKElicitationCompleteMessageSchema, SDKPromptSuggestionMessageSchema, SDKSessionInfoSchema, SDKMessageSchema, FastModeStateSchema;
 var init_coreSchemas = __esm(() => {
   init_v4();
   ModelUsageSchema = lazySchema(() => exports_external.object({
@@ -55533,14 +55533,14 @@ var init_coreSchemas = __esm(() => {
     McpHttpServerConfigSchema(),
     McpSdkServerConfigSchema()
   ]));
-  McpClaudeAIProxyServerConfigSchema = lazySchema(() => exports_external.object({
-    type: exports_external.literal("claudeai-proxy"),
+  McpAINativeProxyServerConfigSchema = lazySchema(() => exports_external.object({
+    type: exports_external.literal("ainative-proxy"),
     url: exports_external.string(),
     id: exports_external.string()
   }));
   McpServerStatusConfigSchema = lazySchema(() => exports_external.union([
     McpServerConfigForProcessTransportSchema(),
-    McpClaudeAIProxyServerConfigSchema()
+    McpAINativeProxyServerConfigSchema()
   ]));
   McpServerStatusSchema = lazySchema(() => exports_external.object({
     name: exports_external.string().describe("Server name as configured"),
@@ -56585,7 +56585,7 @@ var init_hooks = __esm(() => {
 });
 
 // src/services/mcp/types.ts
-var ConfigScopeSchema2, TransportSchema, McpStdioServerConfigSchema2, McpXaaConfigSchema, McpOAuthConfigSchema, McpSSEServerConfigSchema2, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema, McpWebSocketServerConfigSchema, McpSdkServerConfigSchema2, McpClaudeAIProxyServerConfigSchema2, McpServerConfigSchema, McpJsonConfigSchema;
+var ConfigScopeSchema2, TransportSchema, McpStdioServerConfigSchema2, McpXaaConfigSchema, McpOAuthConfigSchema, McpSSEServerConfigSchema2, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema, McpWebSocketServerConfigSchema, McpSdkServerConfigSchema2, McpAINativeProxyServerConfigSchema2, McpServerConfigSchema, McpJsonConfigSchema;
 var init_types2 = __esm(() => {
   init_v4();
   ConfigScopeSchema2 = lazySchema(() => exports_external.enum([
@@ -56594,6 +56594,7 @@ var init_types2 = __esm(() => {
     "project",
     "dynamic",
     "enterprise",
+    "ainative",
     "claudeai",
     "managed"
   ]));
@@ -56650,8 +56651,8 @@ var init_types2 = __esm(() => {
     type: exports_external.literal("sdk"),
     name: exports_external.string()
   }));
-  McpClaudeAIProxyServerConfigSchema2 = lazySchema(() => exports_external.object({
-    type: exports_external.literal("claudeai-proxy"),
+  McpAINativeProxyServerConfigSchema2 = lazySchema(() => exports_external.object({
+    type: exports_external.literal("ainative-proxy"),
     url: exports_external.string(),
     id: exports_external.string()
   }));
@@ -56663,7 +56664,7 @@ var init_types2 = __esm(() => {
     McpHTTPServerConfigSchema(),
     McpWebSocketServerConfigSchema(),
     McpSdkServerConfigSchema2(),
-    McpClaudeAIProxyServerConfigSchema2()
+    McpAINativeProxyServerConfigSchema2()
   ]));
   McpJsonConfigSchema = lazySchema(() => exports_external.object({
     mcpServers: exports_external.record(exports_external.string(), McpServerConfigSchema())
@@ -173129,7 +173130,7 @@ var init_auth2 = __esm(() => {
 
 // src/utils/userAgent.ts
 function getCodyUserAgent() {
-  return `cody-cli/${"0.7.15"}`;
+  return `cody-cli/${"0.7.35"}`;
 }
 
 // src/utils/workloadContext.ts
@@ -173151,7 +173152,7 @@ function getUserAgent() {
   const clientApp = process.env.CLAUDE_AGENT_SDK_CLIENT_APP ? `, client-app/${process.env.CLAUDE_AGENT_SDK_CLIENT_APP}` : "";
   const workload = getWorkload();
   const workloadSuffix = workload ? `, workload/${workload}` : "";
-  return `claude-cli/${"0.7.15"} (${"external"}, ${process.env.CLAUDE_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
+  return `claude-cli/${"0.7.35"} (${"external"}, ${process.env.CLAUDE_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
 }
 function getMCPUserAgent() {
   const parts = [];
@@ -173165,7 +173166,7 @@ function getMCPUserAgent() {
     parts.push(`client-app/${process.env.CLAUDE_AGENT_SDK_CLIENT_APP}`);
   }
   const suffix = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-  return `cody-cli/${"0.7.15"}${suffix}`;
+  return `cody-cli/${"0.7.35"}${suffix}`;
 }
 function getWebFetchUserAgent() {
   return `Cody-User (${getCodyUserAgent()}; +https://ainative.studio)`;
@@ -173303,7 +173304,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "0.7.15",
+      appVersion: "0.7.35",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -180577,7 +180578,7 @@ function isAnalyticsToolDetailsLoggingEnabled(mcpServerType, mcpServerBaseUrl) {
   if (process.env.CLAUDE_CODE_ENTRYPOINT === "local-agent") {
     return true;
   }
-  if (mcpServerType === "claudeai-proxy") {
+  if (mcpServerType === "ainative-proxy") {
     return true;
   }
   if (mcpServerBaseUrl && isOfficialMcpUrl(mcpServerBaseUrl)) {
@@ -180995,7 +180996,7 @@ var init_metadata = __esm(() => {
   COMPOUND_OPERATOR_REGEX = /\s*(?:&&|\|\||[;|])\s*/;
   WHITESPACE_REGEX = /\s+/;
   getVersionBase = memoize_default(() => {
-    const match = "0.7.15".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
+    const match = "0.7.35".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
     return match ? match[0] : undefined;
   });
   buildEnvContext = memoize_default(async () => {
@@ -181035,9 +181036,9 @@ var init_metadata = __esm(() => {
       isGithubAction: isEnvTruthy(process.env.GITHUB_ACTIONS),
       isClaudeCodeAction: isEnvTruthy(process.env.CLAUDE_CODE_ACTION),
       isClaudeAiAuth: isClaudeAISubscriber(),
-      version: "0.7.15",
+      version: "0.7.35",
       versionBase: getVersionBase(),
-      buildTime: "1777195198",
+      buildTime: "1777670343",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -181655,7 +181656,7 @@ function initialize1PEventLogging() {
   const platform3 = getPlatform();
   const attributes = {
     [import_semantic_conventions.ATTR_SERVICE_NAME]: "cody-cli",
-    [import_semantic_conventions.ATTR_SERVICE_VERSION]: "0.7.15"
+    [import_semantic_conventions.ATTR_SERVICE_VERSION]: "0.7.35"
   };
   if (platform3 === "wsl") {
     const wslVersion = getWslVersion();
@@ -181682,7 +181683,7 @@ function initialize1PEventLogging() {
       })
     ]
   });
-  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.ainative.cody_cli.events", "0.7.15");
+  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.ainative.cody_cli.events", "0.7.35");
 }
 async function reinitialize1PEventLoggingIfConfigChanged() {
   if (!is1PEventLoggingEnabled() || !firstPartyEventLoggerProvider) {
@@ -183375,7 +183376,7 @@ function getAttributionHeader(fingerprint) {
   if (!isAttributionHeaderEnabled()) {
     return "";
   }
-  const version6 = `${"0.7.15"}.${fingerprint}`;
+  const version6 = `${"0.7.35"}.${fingerprint}`;
   const entrypoint = process.env.CLAUDE_CODE_ENTRYPOINT ?? "unknown";
   const cch = "";
   const workload = getWorkload();
@@ -219324,6 +219325,25 @@ function ripgrepCommand() {
     argv0: config2.argv0
   };
 }
+function getRipgrepMissingWarning() {
+  const config2 = getRipgrepConfig();
+  if (config2.mode === "embedded")
+    return null;
+  if (config2.mode === "system")
+    return null;
+  const { existsSync: existsSync3 } = __require("fs");
+  if (existsSync3(config2.command))
+    return null;
+  let installHint;
+  if (process.platform === "darwin") {
+    installHint = "brew install ripgrep";
+  } else if (process.platform === "linux") {
+    installHint = "apt install ripgrep  |  dnf install ripgrep";
+  } else {
+    installHint = "https://github.com/BurntSushi/ripgrep#installation";
+  }
+  return `ripgrep (rg) not found — Glob/Grep tools will not work. Install: ${installHint}`;
+}
 function isEagainError(stderr) {
   return stderr.includes("os error 11") || stderr.includes("Resource temporarily unavailable");
 }
@@ -233941,10 +233961,14 @@ var init_planAgent = __esm(() => {
 // src/tools/AgentTool/built-in/statuslineSetup.ts
 var STATUSLINE_SYSTEM_PROMPT = `You are a status line setup agent for Cody CLI. Your job is to create or update the statusLine command in the user's Cody CLI settings.
 
+Cody CLI stores all configuration in ~/.cody/ (not ~/.claude/).
+- User settings file: ~/.cody/settings.json
+- Status line script: ~/.cody/statusline-command.sh
+
 When asked to convert the user's shell PS1 configuration, follow these steps:
 1. Read the user's shell configuration files in this order of preference:
    - ~/.zshrc
-   - ~/.bashrc  
+   - ~/.bashrc
    - ~/.bash_profile
    - ~/.profile
 
@@ -233952,7 +233976,7 @@ When asked to convert the user's shell PS1 configuration, follow these steps:
 
 3. Convert PS1 escape sequences to shell commands:
    - \\u → $(whoami)
-   - \\h → $(hostname -s)  
+   - \\h → $(hostname -s)
    - \\H → $(hostname)
    - \\w → $(pwd)
    - \\W → $(basename "$(pwd)")
@@ -233978,15 +234002,15 @@ How to use the statusLine command:
      "transcript_path": "string", // Path to the conversation transcript
      "cwd": "string",         // Current working directory
      "model": {
-       "id": "string",           // Model ID (e.g., "claude-3-5-sonnet-20241022")
-       "display_name": "string"  // Display name (e.g., "Claude 3.5 Sonnet")
+       "id": "string",           // Model ID (e.g., "qwen-coder-32b")
+       "display_name": "string"  // Display name (e.g., "Qwen Coder 32B")
      },
      "workspace": {
        "current_dir": "string",  // Current working directory path
        "project_dir": "string",  // Project root directory path
        "added_dirs": ["string"]  // Directories added via /add-dir
      },
-     "version": "string",        // Cody CLI app version (e.g., "1.0.71")
+     "version": "string",        // Cody CLI app version (e.g., "0.7.34")
      "output_style": {
        "name": "string",         // Output style name (e.g., "default", "Explanatory", "Learning")
      },
@@ -234003,7 +234027,7 @@ How to use the statusLine command:
        "used_percentage": number | null,      // Pre-calculated: % of context used (0-100), null if no messages yet
        "remaining_percentage": number | null  // Pre-calculated: % of context remaining (0-100), null if no messages yet
      },
-     "rate_limits": {             // Optional: Claude.ai subscription usage limits. Only present for subscribers after first API response.
+     "rate_limits": {             // Optional: AINative subscription usage limits. Only present for subscribers after first API response.
        "five_hour": {             // Optional: 5-hour session limit (may be absent)
          "used_percentage": number,   // Percentage of limit used (0-100)
          "resets_at": number          // Unix epoch seconds when this window resets
@@ -234016,7 +234040,7 @@ How to use the statusLine command:
      "vim": {                     // Optional, only present when vim mode is enabled
        "mode": "INSERT" | "NORMAL"  // Current vim editor mode
      },
-     "agent": {                    // Optional, only present when Claude is started with --agent flag
+     "agent": {                    // Optional, only present when Cody is started with --agent flag
        "name": "string",           // Agent name (e.g., "code-architect", "test-runner")
        "type": "string"            // Optional: Agent type identifier
      },
@@ -234024,11 +234048,11 @@ How to use the statusLine command:
        "name": "string",           // Worktree name/slug (e.g., "my-feature")
        "path": "string",           // Full path to the worktree directory
        "branch": "string",         // Optional: Git branch name for the worktree
-       "original_cwd": "string",   // The directory Claude was in before entering the worktree
+       "original_cwd": "string",   // The directory Cody was in before entering the worktree
        "original_branch": "string" // Optional: Branch that was checked out before entering the worktree
      }
    }
-   
+
    You can use this JSON data in your command like:
    - $(cat | jq -r '.model.display_name')
    - $(cat | jq -r '.workspace.current_dir')
@@ -234043,29 +234067,28 @@ How to use the statusLine command:
    Or to display context used percentage:
    - input=$(cat); used=$(echo "$input" | jq -r '.context_window.used_percentage // empty'); [ -n "$used" ] && echo "Context: $used% used"
 
-   To display subscription rate limit usage (5-hour session limit):
+   To display AINative subscription rate limit usage (5-hour session limit):
    - input=$(cat); pct=$(echo "$input" | jq -r '.rate_limits.five_hour.used_percentage // empty'); [ -n "$pct" ] && printf "5h: %.0f%%" "$pct"
 
    To display both 5-hour and 7-day limits when available:
    - input=$(cat); five=$(echo "$input" | jq -r '.rate_limits.five_hour.used_percentage // empty'); week=$(echo "$input" | jq -r '.rate_limits.seven_day.used_percentage // empty'); out=""; [ -n "$five" ] && out="5h:$(printf '%.0f' "$five")%"; [ -n "$week" ] && out="$out 7d:$(printf '%.0f' "$week")%"; echo "$out"
 
-2. For longer commands, you can save a new file in the user's ~/.cody directory, e.g.:
-   - ~/.cody/statusline-command.sh and reference that file in the settings.
+2. For longer commands, save the script to ~/.cody/statusline-command.sh and reference it in settings.
 
 3. Update the user's ~/.cody/settings.json with:
    {
      "statusLine": {
-       "type": "command", 
-       "command": "your_command_here"
+       "type": "command",
+       "command": "bash ~/.cody/statusline-command.sh"
      }
    }
 
 4. If ~/.cody/settings.json is a symlink, update the target file instead.
 
 Guidelines:
-- Preserve existing settings when updating
-- Return a summary of what was configured, including the name of the script file if used
-- If the script includes git commands, they should skip optional locks
+- Preserve existing settings when updating ~/.cody/settings.json
+- Return a summary of what was configured, including the script file path if used
+- If the script includes git commands, they should skip optional locks (use -c core.useBuiltinFSMonitor=false)
 - IMPORTANT: At the end of your response, inform the parent agent that this "statusline-setup" agent must be used for further status line changes.
   Also ensure that the user is informed that they can ask Cody to continue to make changes to the status line.
 `, STATUSLINE_SETUP_AGENT;
@@ -247498,7 +247521,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "0.7.15";
+    attributes["app.version"] = "0.7.35";
   }
   const oauthAccount = getOauthAccountInfo();
   if (oauthAccount) {
@@ -272924,7 +272947,7 @@ function resolvePluginMcpEnvironment(config3, plugin, userConfig, errors4, plugi
     case "sse-ide":
     case "ws-ide":
     case "sdk":
-    case "claudeai-proxy":
+    case "ainative-proxy":
       resolved = config3;
       break;
   }
@@ -272979,24 +273002,24 @@ var init_mcpPluginIntegration = __esm(() => {
   init_pluginOptionsStorage();
 });
 
-// src/services/mcp/claudeai.ts
-function clearClaudeAIMcpConfigsCache() {
-  fetchClaudeAIMcpConfigsIfEligible.cache.clear?.();
+// src/services/mcp/ainative.ts
+function clearAINativeMcpConfigsCache() {
+  fetchAINativeMcpConfigsIfEligible.cache.clear?.();
   clearMcpAuthCache();
 }
-function markClaudeAiMcpConnected(name3) {
+function markAINativeMcpConnected(name3) {
   saveGlobalConfig((current) => {
-    const seen = current.claudeAiMcpEverConnected ?? [];
+    const seen = current.ainativeMcpEverConnected ?? [];
     if (seen.includes(name3))
       return current;
-    return { ...current, claudeAiMcpEverConnected: [...seen, name3] };
+    return { ...current, ainativeMcpEverConnected: [...seen, name3] };
   });
 }
-function hasClaudeAiMcpEverConnected(name3) {
-  return (getGlobalConfig().claudeAiMcpEverConnected ?? []).includes(name3);
+function hasAINativeMcpEverConnected(name3) {
+  return (getGlobalConfig().ainativeMcpEverConnected ?? []).includes(name3);
 }
-var FETCH_TIMEOUT_MS = 5000, MCP_SERVERS_BETA_HEADER = "mcp-servers-2025-12-04", fetchClaudeAIMcpConfigsIfEligible;
-var init_claudeai = __esm(() => {
+var FETCH_TIMEOUT_MS = 5000, fetchAINativeMcpConfigsIfEligible;
+var init_ainative = __esm(() => {
   init_axios2();
   init_memoize();
   init_oauth();
@@ -273006,46 +273029,44 @@ var init_claudeai = __esm(() => {
   init_debug();
   init_envUtils();
   init_client8();
-  fetchClaudeAIMcpConfigsIfEligible = memoize_default(async () => {
+  fetchAINativeMcpConfigsIfEligible = memoize_default(async () => {
     try {
-      if (isEnvDefinedFalsy(process.env.ENABLE_CLAUDEAI_MCP_SERVERS)) {
-        logForDebugging("[claudeai-mcp] Disabled via env var");
-        logEvent("tengu_claudeai_mcp_eligibility", {
+      if (isEnvDefinedFalsy(process.env.ENABLE_AINATIVE_MCP_SERVERS)) {
+        logForDebugging("[ainative-mcp] Disabled via env var");
+        logEvent("tengu_ainative_mcp_eligibility", {
           state: "disabled_env_var"
         });
         return {};
       }
       const tokens = getClaudeAIOAuthTokens();
       if (!tokens?.accessToken) {
-        logForDebugging("[claudeai-mcp] No access token");
-        logEvent("tengu_claudeai_mcp_eligibility", {
+        logForDebugging("[ainative-mcp] No access token");
+        logEvent("tengu_ainative_mcp_eligibility", {
           state: "no_oauth_token"
         });
         return {};
       }
       if (!tokens.scopes?.includes("user:mcp_servers")) {
-        logForDebugging(`[claudeai-mcp] Missing user:mcp_servers scope (scopes=${tokens.scopes?.join(",") || "none"})`);
-        logEvent("tengu_claudeai_mcp_eligibility", {
+        logForDebugging(`[ainative-mcp] Missing user:mcp_servers scope (scopes=${tokens.scopes?.join(",") || "none"})`);
+        logEvent("tengu_ainative_mcp_eligibility", {
           state: "missing_scope"
         });
         return {};
       }
       const baseUrl = getOauthConfig().BASE_API_URL;
-      const url3 = `${baseUrl}/v1/mcp_servers?limit=1000`;
-      logForDebugging(`[claudeai-mcp] Fetching from ${url3}`);
+      const url3 = `${baseUrl}/api/oauth/account/mcp_servers`;
+      logForDebugging(`[ainative-mcp] Fetching from ${url3}`);
       const response = await axios_default.get(url3, {
         headers: {
           Authorization: `Bearer ${tokens.accessToken}`,
-          "Content-Type": "application/json",
-          "anthropic-beta": MCP_SERVERS_BETA_HEADER,
-          "anthropic-version": "2023-06-01"
+          "Content-Type": "application/json"
         },
         timeout: FETCH_TIMEOUT_MS
       });
       const configs = {};
       const usedNormalizedNames = new Set;
       for (const server of response.data.data) {
-        const baseName = `claude.ai ${server.display_name}`;
+        const baseName = `ainative ${server.display_name}`;
         let finalName = baseName;
         let finalNormalized = normalizeNameForMCP(finalName);
         let count3 = 1;
@@ -273056,19 +273077,19 @@ var init_claudeai = __esm(() => {
         }
         usedNormalizedNames.add(finalNormalized);
         configs[finalName] = {
-          type: "claudeai-proxy",
+          type: "ainative-proxy",
           url: server.url,
           id: server.id,
-          scope: "claudeai"
+          scope: "ainative"
         };
       }
-      logForDebugging(`[claudeai-mcp] Fetched ${Object.keys(configs).length} servers`);
-      logEvent("tengu_claudeai_mcp_eligibility", {
+      logForDebugging(`[ainative-mcp] Fetched ${Object.keys(configs).length} servers`);
+      logEvent("tengu_ainative_mcp_eligibility", {
         state: "eligible"
       });
       return configs;
     } catch {
-      logForDebugging(`[claudeai-mcp] Fetch failed`);
+      logForDebugging(`[ainative-mcp] Fetch failed`);
       return {};
     }
   });
@@ -273196,7 +273217,7 @@ function dedupPluginMcpServers(pluginServers, manualServers) {
   }
   return { servers, suppressed };
 }
-function dedupClaudeAiMcpServers(claudeAiServers, manualServers) {
+function dedupAINativeMcpServers(claudeAiServers, manualServers) {
   const manualSigs = new Map;
   for (const [name3, config3] of Object.entries(manualServers)) {
     if (isMcpServerDisabled(name3))
@@ -273382,7 +273403,7 @@ function expandEnvVars(config3) {
     case "sdk":
       expanded = config3;
       break;
-    case "claudeai-proxy":
+    case "ainative-proxy":
       expanded = config3;
       break;
   }
@@ -273440,8 +273461,9 @@ async function addMcpConfig(name3, config3, scope) {
       throw new Error("Cannot add MCP server to scope: dynamic");
     case "enterprise":
       throw new Error("Cannot add MCP server to scope: enterprise");
+    case "ainative":
     case "claudeai":
-      throw new Error("Cannot add MCP server to scope: claudeai");
+      throw new Error("Cannot add MCP server to scope: ainative");
   }
   switch (scope) {
     case "project": {
@@ -273783,11 +273805,11 @@ async function getAllMcpConfigs() {
   if (doesEnterpriseMcpConfigExist()) {
     return getClaudeCodeMcpConfigs();
   }
-  const claudeaiPromise = fetchClaudeAIMcpConfigsIfEligible();
-  const { servers: claudeCodeServers, errors: errors4 } = await getClaudeCodeMcpConfigs({}, claudeaiPromise);
-  const { allowed: claudeaiMcpServers } = filterMcpServersByPolicy(await claudeaiPromise);
-  const { servers: dedupedClaudeAi } = dedupClaudeAiMcpServers(claudeaiMcpServers, claudeCodeServers);
-  const servers = Object.assign({}, dedupedClaudeAi, claudeCodeServers);
+  const ainativePromise = fetchAINativeMcpConfigsIfEligible();
+  const { servers: claudeCodeServers, errors: errors4 } = await getClaudeCodeMcpConfigs({}, ainativePromise);
+  const { allowed: ainativeMcpServers } = filterMcpServersByPolicy(await ainativePromise);
+  const { servers: dedupedAINative } = dedupAINativeMcpServers(ainativeMcpServers, claudeCodeServers);
+  const servers = Object.assign({}, dedupedAINative, claudeCodeServers);
   return { servers, errors: errors4 };
 }
 function parseMcpConfig(params) {
@@ -273985,7 +274007,7 @@ var init_config3 = __esm(() => {
   init_types3();
   init_slowOperations();
   init_analytics();
-  init_claudeai();
+  init_ainative();
   init_types2();
   init_utils5();
   CCR_PROXY_PATH_MARKERS = [
@@ -274089,6 +274111,7 @@ function describeMcpConfigFilePath(scope) {
       return "Dynamically configured";
     case "enterprise":
       return getEnterpriseMcpFilePath();
+    case "ainative":
     case "claudeai":
       return "ainative.studio";
     default:
@@ -274107,6 +274130,7 @@ function getScopeLabel(scope) {
       return "Dynamic config (from command line)";
     case "enterprise":
       return "Enterprise config (managed by your organization)";
+    case "ainative":
     case "claudeai":
       return "ainative.studio config";
     default:
@@ -274171,8 +274195,8 @@ function getMcpServerScopeFromToolName(toolName) {
     return null;
   }
   const serverConfig = getMcpConfigByName(mcpInfo.serverName);
-  if (!serverConfig && mcpInfo.serverName.startsWith("claude_ai_")) {
-    return "claudeai";
+  if (!serverConfig && mcpInfo.serverName.startsWith("ainative_")) {
+    return "ainative";
   }
   return serverConfig?.scope ?? null;
 }
@@ -276222,7 +276246,7 @@ function createMcpAuthTool(serverName, config3) {
       return { behavior: "allow", updatedInput: input };
     },
     async call(_input, context3) {
-      if (config3.type === "claudeai-proxy") {
+      if (config3.type === "ainative-proxy") {
         return {
           data: {
             status: "unsupported",
@@ -278680,7 +278704,7 @@ function getInstallationEnv() {
   return;
 }
 function getClaudeCodeVersion() {
-  return "0.7.15";
+  return "0.7.35";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -283427,7 +283451,7 @@ function handleRemoteAuthFailure(name3, serverRef, transportType) {
   const label = {
     sse: "SSE",
     http: "HTTP",
-    "claudeai-proxy": "AINative proxy"
+    "ainative-proxy": "AINative proxy"
   };
   logMCPDebug(name3, `Authentication required for ${label[transportType]} server`);
   setMcpAuthCacheEntry(name3);
@@ -283583,8 +283607,8 @@ async function reconnectMcpServerImpl(name3, config3) {
         commands: []
       };
     }
-    if (config3.type === "claudeai-proxy") {
-      markClaudeAiMcpConnected(name3);
+    if (config3.type === "ainative-proxy") {
+      markAINativeMcpConnected(name3);
     }
     const supportsResources = !!client4.capabilities?.resources;
     const [tools, mcpCommands, mcpSkills, resources] = await Promise.all([
@@ -283664,7 +283688,7 @@ async function getMcpToolsCommandsAndResources(onConnectionAttempt, mcpConfigs)
         });
         return;
       }
-      if ((config3.type === "claudeai-proxy" || config3.type === "http" || config3.type === "sse") && (await isMcpAuthCached(name3) || (config3.type === "http" || config3.type === "sse") && hasMcpDiscoveryButNoToken(name3, config3))) {
+      if ((config3.type === "ainative-proxy" || config3.type === "http" || config3.type === "sse") && (await isMcpAuthCached(name3) || (config3.type === "http" || config3.type === "sse") && hasMcpDiscoveryButNoToken(name3, config3))) {
         logMCPDebug(name3, `Skipping connection (cached needs-auth)`);
         onConnectionAttempt({
           client: { name: name3, type: "needs-auth", config: config3 },
@@ -283682,8 +283706,8 @@ async function getMcpToolsCommandsAndResources(onConnectionAttempt, mcpConfigs)
         });
         return;
       }
-      if (config3.type === "claudeai-proxy") {
-        markClaudeAiMcpConnected(name3);
+      if (config3.type === "ainative-proxy") {
+        markAINativeMcpConnected(name3);
       }
       const supportsResources = !!client4.capabilities?.resources;
       const [tools, mcpCommands, mcpSkills, resources] = await Promise.all([
@@ -284182,7 +284206,7 @@ async function callMCPTool({
         throw new McpAuthError(name3, `MCP server "${name3}" requires re-authorization (token expired)`);
       }
       const isSessionExpired = isMcpSessionExpiredError(e);
-      const isConnectionClosedOnHttp = "code" in e && e.code === -32000 && e.message.includes("Connection closed") && (config3.type === "http" || config3.type === "claudeai-proxy");
+      const isConnectionClosedOnHttp = "code" in e && e.code === -32000 && e.message.includes("Connection closed") && (config3.type === "http" || config3.type === "ainative-proxy");
       if (isSessionExpired || isConnectionClosedOnHttp) {
         logMCPDebug(name3, `MCP session expired during tool call (${isSessionExpired ? "404/-32001" : "connection closed"}), clearing connection cache for re-initialization`);
         logEvent("tengu_mcp_session_expired", {});
@@ -284214,7 +284238,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client4 = new Client({
       name: "claude-code",
       title: "Cody CLI",
-      version: "0.7.15",
+      version: "0.7.35",
       description: "Anthropic's agentic coding tool",
       websiteUrl: PRODUCT_URL
     }, {
@@ -284308,7 +284332,7 @@ var init_client8 = __esm(() => {
   init_classifyForCollapse();
   init_macOsKeychainHelpers();
   init_auth6();
-  init_claudeai();
+  init_ainative();
   init_config3();
   init_headersHelper();
   init_common2();
@@ -284502,7 +284526,7 @@ var init_client8 = __esm(() => {
         logMCPDebug(name3, `HTTP transport created successfully`);
       } else if (serverRef.type === "sdk") {
         throw new Error("SDK servers should be handled in print.ts");
-      } else if (serverRef.type === "claudeai-proxy") {
+      } else if (serverRef.type === "ainative-proxy") {
         logMCPDebug(name3, `Initializing claude.ai proxy transport for server ${serverRef.id}`);
         const tokens = getClaudeAIOAuthTokens();
         if (!tokens) {
@@ -284568,7 +284592,7 @@ var init_client8 = __esm(() => {
       const client4 = new Client({
         name: "claude-code",
         title: "Cody CLI",
-        version: "0.7.15",
+        version: "0.7.35",
         description: "Anthropic's agentic coding tool",
         websiteUrl: PRODUCT_URL
       }, {
@@ -284648,12 +284672,12 @@ var init_client8 = __esm(() => {
           if (error43 instanceof UnauthorizedError) {
             return handleRemoteAuthFailure(name3, serverRef, "http");
           }
-        } else if (serverRef.type === "claudeai-proxy" && error43 instanceof Error) {
+        } else if (serverRef.type === "ainative-proxy" && error43 instanceof Error) {
           logMCPDebug(name3, `claude.ai proxy connection failed after ${elapsed}ms: ${error43.message}`);
           logMCPError(name3, error43);
           const errorCode = error43.code;
           if (errorCode === 401) {
-            return handleRemoteAuthFailure(name3, serverRef, "claudeai-proxy");
+            return handleRemoteAuthFailure(name3, serverRef, "ainative-proxy");
           }
         } else if (serverRef.type === "sse-ide" || serverRef.type === "ws-ide") {
           logEvent("tengu_mcp_ide_server_connection_failed", {
@@ -284744,7 +284768,7 @@ var init_client8 = __esm(() => {
             logMCPDebug(name3, `Connection error: ${error43.message}`);
           }
         }
-        if ((transportType === "http" || transportType === "claudeai-proxy") && isMcpSessionExpiredError(error43)) {
+        if ((transportType === "http" || transportType === "ainative-proxy") && isMcpSessionExpiredError(error43)) {
           logMCPDebug(name3, `MCP session expired (server returned 404 with session-not-found), triggering reconnection`);
           closeTransportAndRejectPending("session expired");
           if (originalOnerror) {
@@ -284752,7 +284776,7 @@ var init_client8 = __esm(() => {
           }
           return;
         }
-        if (transportType === "sse" || transportType === "http" || transportType === "claudeai-proxy") {
+        if (transportType === "sse" || transportType === "http" || transportType === "ainative-proxy") {
           if (error43.message.includes("Maximum reconnection attempts")) {
             closeTransportAndRejectPending("SSE reconnection exhausted");
             if (originalOnerror) {
@@ -332700,7 +332724,7 @@ async function initializeBetaTracing(resource) {
   });
   import_api_logs.logs.setGlobalLoggerProvider(loggerProvider);
   setLoggerProvider(loggerProvider);
-  const eventLogger = import_api_logs.logs.getLogger("com.anthropic.claude_code.events", "0.7.15");
+  const eventLogger = import_api_logs.logs.getLogger("com.anthropic.claude_code.events", "0.7.35");
   setEventLogger(eventLogger);
   process.on("beforeExit", async () => {
     await loggerProvider?.forceFlush();
@@ -332740,7 +332764,7 @@ async function initializeTelemetry() {
   const platform5 = getPlatform();
   const baseAttributes = {
     [import_semantic_conventions2.ATTR_SERVICE_NAME]: "claude-code",
-    [import_semantic_conventions2.ATTR_SERVICE_VERSION]: "0.7.15"
+    [import_semantic_conventions2.ATTR_SERVICE_VERSION]: "0.7.35"
   };
   if (platform5 === "wsl") {
     const wslVersion = getWslVersion();
@@ -332785,7 +332809,7 @@ async function initializeTelemetry() {
       } catch {}
     };
     registerCleanup(shutdownTelemetry2);
-    return meterProvider2.getMeter("com.anthropic.claude_code", "0.7.15");
+    return meterProvider2.getMeter("com.anthropic.claude_code", "0.7.35");
   }
   const meterProvider = new import_sdk_metrics2.MeterProvider({
     resource,
@@ -332805,7 +332829,7 @@ async function initializeTelemetry() {
       });
       import_api_logs.logs.setGlobalLoggerProvider(loggerProvider);
       setLoggerProvider(loggerProvider);
-      const eventLogger = import_api_logs.logs.getLogger("com.anthropic.claude_code.events", "0.7.15");
+      const eventLogger = import_api_logs.logs.getLogger("com.anthropic.claude_code.events", "0.7.35");
       setEventLogger(eventLogger);
       logForDebugging("[3P telemetry] Event logger set successfully");
       process.on("beforeExit", async () => {
@@ -332867,7 +332891,7 @@ Current timeout: ${timeoutMs}ms
     }
   };
   registerCleanup(shutdownTelemetry);
-  return meterProvider.getMeter("com.anthropic.claude_code", "0.7.15");
+  return meterProvider.getMeter("com.anthropic.claude_code", "0.7.35");
 }
 async function flushTelemetry() {
   const meterProvider = getMeterProvider();
@@ -333556,9 +333580,9 @@ async function assertMinVersion() {
   }
   try {
     const versionConfig = await getDynamicConfig_BLOCKS_ON_INIT("tengu_version_config", { minVersion: "0.0.0" });
-    if (versionConfig.minVersion && lt("0.7.15", versionConfig.minVersion)) {
+    if (versionConfig.minVersion && lt("0.7.35", versionConfig.minVersion)) {
       console.error(`
-It looks like your version of Cody CLI (${"0.7.15"}) needs an update.
+It looks like your version of Cody CLI (${"0.7.35"}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
 
 To update, please run:
@@ -333795,7 +333819,7 @@ async function installGlobalPackage(specificVersion) {
     logError2(new AutoUpdaterError("Another process is currently installing an update"));
     logEvent("tengu_auto_updater_lock_contention", {
       pid: process.pid,
-      currentVersion: "0.7.15"
+      currentVersion: "0.7.35"
     });
     return "in_progress";
   }
@@ -333804,7 +333828,7 @@ async function installGlobalPackage(specificVersion) {
     if (!env4.isRunningWithBun() && env4.isNpmFromWindowsPath()) {
       logError2(new Error("Windows NPM detected in WSL environment"));
       logEvent("tengu_auto_updater_windows_npm_in_wsl", {
-        currentVersion: "0.7.15"
+        currentVersion: "0.7.35"
       });
       console.error(`
 Error: Windows NPM detected in WSL
@@ -334339,7 +334363,7 @@ function detectLinuxGlobPatternWarnings() {
 }
 async function getDoctorDiagnostic() {
   const installationType = await getCurrentInstallationType();
-  const version6 = typeof MACRO !== "undefined" ? "0.7.15" : "unknown";
+  const version6 = typeof MACRO !== "undefined" ? "0.7.35" : "unknown";
   const installationPath = await getInstallationPath();
   const invokedBinary = getInvokedBinary();
   const multipleInstallations = await detectMultipleInstallations();
@@ -335174,8 +335198,8 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
     const maxVersion = await getMaxVersion();
     if (maxVersion && gt(version6, maxVersion)) {
       logForDebugging(`Native installer: maxVersion ${maxVersion} is set, capping update from ${version6} to ${maxVersion}`);
-      if (gte("0.7.15", maxVersion)) {
-        logForDebugging(`Native installer: current version ${"0.7.15"} is already at or above maxVersion ${maxVersion}, skipping update`);
+      if (gte("0.7.35", maxVersion)) {
+        logForDebugging(`Native installer: current version ${"0.7.35"} is already at or above maxVersion ${maxVersion}, skipping update`);
         logEvent("tengu_native_update_skipped_max_version", {
           latency_ms: Date.now() - startTime,
           max_version: maxVersion,
@@ -335186,7 +335210,7 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
       version6 = maxVersion;
     }
   }
-  if (!forceReinstall && version6 === "0.7.15" && await versionIsAvailable(version6) && await isPossibleClaudeBinary(executablePath)) {
+  if (!forceReinstall && version6 === "0.7.35" && await versionIsAvailable(version6) && await isPossibleClaudeBinary(executablePath)) {
     logForDebugging(`Found ${version6} at ${executablePath}, skipping install`);
     logEvent("tengu_native_update_complete", {
       latency_ms: Date.now() - startTime,
@@ -419007,7 +419031,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("1777195198").getTime();
+  const buildTime = new Date("1777670343").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -442520,7 +442544,7 @@ function Feedback({
       platform: env4.platform,
       gitRepo: envInfo.isGit,
       terminal: env4.terminal,
-      version: "0.7.15",
+      version: "0.7.35",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -442712,7 +442736,7 @@ function Feedback({
                       ", ",
                       env4.terminal,
                       ", v",
-                      "0.7.15"
+                      "0.7.35"
                     ]
                   }, undefined, true, undefined, this)
                 ]
@@ -442818,7 +442842,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env4.platform}
 ` + `- Terminal: ${env4.terminal}
-` + `- Version: ${"0.7.15"}
+` + `- Version: ${"0.7.35"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -445918,7 +445942,7 @@ function buildPrimarySection() {
   }, undefined, false, undefined, this);
   return [{
     label: "Version",
-    value: "0.7.15"
+    value: "0.7.35"
   }, {
     label: "Session name",
     value: nameValue
@@ -449669,7 +449693,7 @@ function Config({
         }
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_dev_runtime178.jsxDEV(ChannelDowngradeDialog, {
-      currentVersion: "0.7.15",
+      currentVersion: "0.7.35",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -449681,7 +449705,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "0.7.15";
+          newSettings.minimumVersion = "0.7.35";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -457723,7 +457747,7 @@ function HelpV2(t0) {
   let t6;
   if ($3[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_dev_runtime205.jsxDEV(Tabs, {
-      title: `Cody CLI v${"0.7.15"}`,
+      title: `Cody CLI v${"0.7.35"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -463475,10 +463499,10 @@ function _temp324(a2, b3) {
   return a2.name.localeCompare(b3.name);
 }
 function _temp235(s_0) {
-  return s_0.client.config.type === "claudeai-proxy";
+  return s_0.client.config.type === "ainative-proxy";
 }
 function _temp97(s) {
-  return s.client.config.type !== "claudeai-proxy";
+  return s.client.config.type !== "ainative-proxy";
 }
 var import_compiler_runtime178, import_react124, jsx_dev_runtime223, SCOPE_ORDER;
 var init_MCPListPanel = __esm(() => {
@@ -464090,14 +464114,14 @@ function useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig = false) {
   import_react125.useEffect(() => {
     let cancelled = false;
     async function loadAndConnectMcpConfigs() {
-      let claudeaiPromise;
+      let ainativePromise;
       if (isStrictMcpConfig || doesEnterpriseMcpConfigExist() || process.env.CODY_CLI === "1") {
-        claudeaiPromise = Promise.resolve({});
+        ainativePromise = Promise.resolve({});
       } else {
-        clearClaudeAIMcpConfigsCache();
-        claudeaiPromise = fetchClaudeAIMcpConfigsIfEligible();
+        clearAINativeMcpConfigsCache();
+        ainativePromise = fetchAINativeMcpConfigsIfEligible();
       }
-      const { servers: claudeCodeConfigs, errors: mcpErrors } = isStrictMcpConfig ? { servers: {}, errors: [] } : await getClaudeCodeMcpConfigs(dynamicMcpConfig, claudeaiPromise);
+      const { servers: claudeCodeConfigs, errors: mcpErrors } = isStrictMcpConfig ? { servers: {}, errors: [] } : await getClaudeCodeMcpConfigs(dynamicMcpConfig, ainativePromise);
       if (cancelled)
         return;
       addErrorsToAppState(setAppState, mcpErrors);
@@ -464106,19 +464130,19 @@ function useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig = false) {
       getMcpToolsCommandsAndResources(onConnectionAttempt, enabledConfigs).catch((error43) => {
         logMCPError("useManageMcpConnections", `Failed to get MCP resources: ${errorMessage(error43)}`);
       });
-      let claudeaiConfigs = {};
+      let ainativeConfigs = {};
       if (!isStrictMcpConfig) {
-        claudeaiConfigs = filterMcpServersByPolicy(await claudeaiPromise).allowed;
+        ainativeConfigs = filterMcpServersByPolicy(await ainativePromise).allowed;
         if (cancelled)
           return;
-        if (Object.keys(claudeaiConfigs).length > 0) {
-          const { servers: dedupedClaudeAi } = dedupClaudeAiMcpServers(claudeaiConfigs, configs);
-          claudeaiConfigs = dedupedClaudeAi;
+        if (Object.keys(ainativeConfigs).length > 0) {
+          const { servers: dedupedAINative } = dedupAINativeMcpServers(ainativeConfigs, configs);
+          ainativeConfigs = dedupedAINative;
         }
-        if (Object.keys(claudeaiConfigs).length > 0) {
+        if (Object.keys(ainativeConfigs).length > 0) {
           setAppState((prevState) => {
             const existingServerNames = new Set(prevState.mcp.clients.map((c6) => c6.name));
-            const newClients = Object.entries(claudeaiConfigs).filter(([name3]) => !existingServerNames.has(name3)).map(([name3, config4]) => ({
+            const newClients = Object.entries(ainativeConfigs).filter(([name3]) => !existingServerNames.has(name3)).map(([name3, config4]) => ({
               name: name3,
               type: isMcpServerDisabled(name3) ? "disabled" : "pending",
               config: config4
@@ -464133,20 +464157,20 @@ function useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig = false) {
               }
             };
           });
-          const enabledClaudeaiConfigs = Object.fromEntries(Object.entries(claudeaiConfigs).filter(([name3]) => !isMcpServerDisabled(name3)));
+          const enabledClaudeaiConfigs = Object.fromEntries(Object.entries(ainativeConfigs).filter(([name3]) => !isMcpServerDisabled(name3)));
           getMcpToolsCommandsAndResources(onConnectionAttempt, enabledClaudeaiConfigs).catch((error43) => {
             logMCPError("useManageMcpConnections", `Failed to get claude.ai MCP resources: ${errorMessage(error43)}`);
           });
         }
       }
-      const allConfigs = { ...configs, ...claudeaiConfigs };
+      const allConfigs = { ...configs, ...ainativeConfigs };
       const counts = {
         enterprise: 0,
         global: 0,
         project: 0,
         user: 0,
         plugin: 0,
-        claudeai: 0
+        ainative: 0
       };
       const stdioCommands = [];
       for (const [name3, serverConfig] of Object.entries(allConfigs)) {
@@ -464160,8 +464184,8 @@ function useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig = false) {
           counts.user++;
         else if (serverConfig.scope === "dynamic")
           counts.plugin++;
-        else if (serverConfig.scope === "claudeai")
-          counts.claudeai++;
+        else if (serverConfig.scope === "ainative")
+          counts.ainative++;
         if (false) {}
       }
       logEvent("tengu_mcp_servers", {
@@ -464273,7 +464297,7 @@ var init_useManageMCPConnections = __esm(() => {
   init_messageQueueManager();
   init_channelNotification();
   init_channelPermissions();
-  init_claudeai();
+  init_ainative();
   init_elicitationHandler();
   init_mcpStringUtils();
   init_utils5();
@@ -464683,10 +464707,10 @@ function MCPRemoteServerMenu({
   const [isReconnecting, setIsReconnecting] = import_react128.useState(false);
   const authAbortControllerRef = import_react128.useRef(null);
   const [isClaudeAIAuthenticating, setIsClaudeAIAuthenticating] = import_react128.useState(false);
-  const [claudeAIAuthUrl, setClaudeAIAuthUrl] = import_react128.useState(null);
+  const [ainativeAuthUrl, setClaudeAIAuthUrl] = import_react128.useState(null);
   const [isClaudeAIClearingAuth, setIsClaudeAIClearingAuth] = import_react128.useState(false);
-  const [claudeAIClearAuthUrl, setClaudeAIClearAuthUrl] = import_react128.useState(null);
-  const [claudeAIClearAuthBrowserOpened, setClaudeAIClearAuthBrowserOpened] = import_react128.useState(false);
+  const [ainativeClearAuthUrl, setClaudeAIClearAuthUrl] = import_react128.useState(null);
+  const [ainativeClearAuthBrowserOpened, setClaudeAIClearAuthBrowserOpened] = import_react128.useState(false);
   const [urlCopied, setUrlCopied] = import_react128.useState(false);
   const copyTimeoutRef = import_react128.useRef(undefined);
   const unmountedRef = import_react128.useRef(false);
@@ -464709,7 +464733,7 @@ function MCPRemoteServerMenu({
     try {
       const result = await reconnectMcpServer(server.name);
       const success2 = result.client.type === "connected";
-      logEvent("tengu_claudeai_mcp_auth_completed", {
+      logEvent("tengu_ainative_mcp_auth_completed", {
         success: success2
       });
       if (success2) {
@@ -464720,7 +464744,7 @@ function MCPRemoteServerMenu({
         onComplete?.("Authentication successful, but server reconnection failed. You may need to manually restart Cody CLI for the changes to take effect.");
       }
     } catch (err2) {
-      logEvent("tengu_claudeai_mcp_auth_completed", {
+      logEvent("tengu_ainative_mcp_auth_completed", {
         success: false
       });
       onComplete?.(handleReconnectError(err2, server.name));
@@ -464752,7 +464776,7 @@ function MCPRemoteServerMenu({
         }
       };
     });
-    logEvent("tengu_claudeai_mcp_clear_auth_completed", {});
+    logEvent("tengu_ainative_mcp_clear_auth_completed", {});
     onComplete?.(`Disconnected from ${server.name}.`);
     setIsClaudeAIClearingAuth(false);
     setClaudeAIClearAuthUrl(null);
@@ -464787,7 +464811,7 @@ function MCPRemoteServerMenu({
       handleClaudeAIAuthComplete();
     }
     if (key.return && isClaudeAIClearingAuth) {
-      if (claudeAIClearAuthBrowserOpened) {
+      if (ainativeClearAuthBrowserOpened) {
         handleClaudeAIClearAuthComplete();
       } else {
         const connectorsUrl = `${getOauthConfig().CLAUDE_AI_ORIGIN}/settings/connectors`;
@@ -464797,7 +464821,7 @@ function MCPRemoteServerMenu({
       }
     }
     if (input === "c" && !urlCopied) {
-      const urlToCopy = authorizationUrl || claudeAIAuthUrl || claudeAIClearAuthUrl;
+      const urlToCopy = authorizationUrl || ainativeAuthUrl || ainativeClearAuthUrl;
       if (urlToCopy) {
         setClipboard(urlToCopy).then((raw) => {
           if (unmountedRef.current)
@@ -464817,32 +464841,32 @@ function MCPRemoteServerMenu({
   const serverCommandsCount = filterMcpPromptsByServer(mcp.commands, server.name).length;
   const toggleMcpServer = useMcpToggleEnabled();
   const handleClaudeAIAuth = import_react128.default.useCallback(async () => {
-    const claudeAiBaseUrl = getOauthConfig().CLAUDE_AI_ORIGIN;
+    const ainativeBaseUrl = getOauthConfig().CLAUDE_AI_ORIGIN;
     const accountInfo = getOauthAccountInfo();
     const orgUuid = accountInfo?.organizationUuid;
     let authUrl;
-    if (orgUuid && server.config.type === "claudeai-proxy" && server.config.id) {
+    if (orgUuid && server.config.type === "ainative-proxy" && server.config.id) {
       const serverId = server.config.id.startsWith("mcprs") ? "mcpsrv" + server.config.id.slice(5) : server.config.id;
       const productSurface = encodeURIComponent(process.env.CLAUDE_CODE_ENTRYPOINT || "cli");
-      authUrl = `${claudeAiBaseUrl}/api/organizations/${orgUuid}/mcp/start-auth/${serverId}?product_surface=${productSurface}`;
+      authUrl = `${ainativeBaseUrl}/api/organizations/${orgUuid}/mcp/start-auth/${serverId}?product_surface=${productSurface}`;
     } else {
-      authUrl = `${claudeAiBaseUrl}/settings/connectors`;
+      authUrl = `${ainativeBaseUrl}/settings/connectors`;
     }
     setClaudeAIAuthUrl(authUrl);
     setIsClaudeAIAuthenticating(true);
-    logEvent("tengu_claudeai_mcp_auth_started", {});
+    logEvent("tengu_ainative_mcp_auth_started", {});
     await openBrowser(authUrl);
   }, [server.config]);
   const handleClaudeAIClearAuth = import_react128.default.useCallback(() => {
     setIsClaudeAIClearingAuth(true);
-    logEvent("tengu_claudeai_mcp_clear_auth_started", {});
+    logEvent("tengu_ainative_mcp_clear_auth_started", {});
   }, []);
   const handleToggleEnabled = import_react128.default.useCallback(async () => {
     const wasEnabled = server.client.type !== "disabled";
     try {
       await toggleMcpServer(server.name);
-      if (server.config.type === "claudeai-proxy") {
-        logEvent("tengu_claudeai_mcp_toggle", {
+      if (server.config.type === "ainative-proxy") {
+        logEvent("tengu_ainative_mcp_toggle", {
           new_state: wasEnabled ? "disabled" : "enabled"
         });
       }
@@ -464853,7 +464877,7 @@ function MCPRemoteServerMenu({
     }
   }, [server.client.type, server.config.type, server.name, toggleMcpServer, onCancel, onComplete]);
   const handleAuthenticate = import_react128.default.useCallback(async () => {
-    if (server.config.type === "claudeai-proxy")
+    if (server.config.type === "ainative-proxy")
       return;
     setIsAuthenticating(true);
     setError(null);
@@ -464897,7 +464921,7 @@ function MCPRemoteServerMenu({
     }
   }, [server.isAuthenticated, server.config, server.name, onComplete, reconnectMcpServer, isEffectivelyAuthenticated]);
   const handleClearAuth = async () => {
-    if (server.config.type === "claudeai-proxy")
+    if (server.config.type === "ainative-proxy")
       return;
     if (server.config) {
       await revokeServerTokens(server.name, server.config);
@@ -464929,7 +464953,7 @@ function MCPRemoteServerMenu({
     }
   };
   if (isAuthenticating) {
-    const authCopy = server.config.type !== "claudeai-proxy" && server.config.oauth?.xaa ? " Authenticating via your identity provider" : " A browser window will open for authentication";
+    const authCopy = server.config.type !== "ainative-proxy" && server.config.oauth?.xaa ? " Authenticating via your identity provider" : " A browser window will open for authentication";
     return /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
       flexDirection: "column",
       gap: 1,
@@ -465046,7 +465070,7 @@ function MCPRemoteServerMenu({
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        claudeAIAuthUrl && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
+        ainativeAuthUrl && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
           flexDirection: "column",
           children: [
             /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
@@ -465072,7 +465096,7 @@ function MCPRemoteServerMenu({
               ]
             }, undefined, true, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(Link, {
-              url: claudeAIAuthUrl
+              url: ainativeAuthUrl
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
@@ -465119,12 +465143,12 @@ function MCPRemoteServerMenu({
             server.name
           ]
         }, undefined, true, undefined, this),
-        claudeAIClearAuthBrowserOpened ? /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(jsx_dev_runtime227.Fragment, {
+        ainativeClearAuthBrowserOpened ? /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(jsx_dev_runtime227.Fragment, {
           children: [
             /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedText, {
               children: 'Find the MCP server in the browser and click "Disconnect".'
             }, undefined, false, undefined, this),
-            claudeAIClearAuthUrl && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
+            ainativeClearAuthUrl && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
               flexDirection: "column",
               children: [
                 /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
@@ -465150,7 +465174,7 @@ function MCPRemoteServerMenu({
                   ]
                 }, undefined, true, undefined, this),
                 /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(Link, {
-                  url: claudeAIClearAuthUrl
+                  url: ainativeClearAuthUrl
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
@@ -465264,16 +465288,16 @@ function MCPRemoteServerMenu({
       value: "tools"
     });
   }
-  if (server.config.type === "claudeai-proxy") {
+  if (server.config.type === "ainative-proxy") {
     if (server.client.type === "connected") {
       menuOptions.push({
         label: "Clear authentication",
-        value: "claudeai-clear-auth"
+        value: "ainative-clear-auth"
       });
     } else if (server.client.type !== "disabled") {
       menuOptions.push({
         label: "Authenticate",
-        value: "claudeai-auth"
+        value: "ainative-auth"
       });
     }
   } else {
@@ -465373,7 +465397,7 @@ function MCPRemoteServerMenu({
                   }, undefined, true, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              server.transport !== "claudeai-proxy" && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
+              server.transport !== "ainative-proxy" && /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedBox_default, {
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime227.jsxDEV(ThemedText, {
                     bold: true,
@@ -465464,18 +465488,18 @@ function MCPRemoteServerMenu({
                   case "clear-auth":
                     await handleClearAuth();
                     break;
-                  case "claudeai-auth":
+                  case "ainative-auth":
                     await handleClaudeAIAuth();
                     break;
-                  case "claudeai-clear-auth":
+                  case "ainative-clear-auth":
                     handleClaudeAIClearAuth();
                     break;
                   case "reconnectMcpServer":
                     setIsReconnecting(true);
                     try {
                       const result_1 = await reconnectMcpServer(server.name);
-                      if (server.config.type === "claudeai-proxy") {
-                        logEvent("tengu_claudeai_mcp_reconnect", {
+                      if (server.config.type === "ainative-proxy") {
+                        logEvent("tengu_ainative_mcp_reconnect", {
                           success: result_1.client.type === "connected"
                         });
                       }
@@ -465484,8 +465508,8 @@ function MCPRemoteServerMenu({
                       } = handleReconnectResult(result_1, server.name);
                       onComplete?.(message_0);
                     } catch (err_2) {
-                      if (server.config.type === "claudeai-proxy") {
-                        logEvent("tengu_claudeai_mcp_reconnect", {
+                      if (server.config.type === "ainative-proxy") {
+                        logEvent("tengu_ainative_mcp_reconnect", {
                           success: false
                         });
                       }
@@ -466404,7 +466428,7 @@ function MCPSettings(t0) {
           const scope = client_0.config.scope;
           const isSSE = client_0.config.type === "sse";
           const isHTTP = client_0.config.type === "http";
-          const isClaudeAIProxy = client_0.config.type === "claudeai-proxy";
+          const isClaudeAIProxy = client_0.config.type === "ainative-proxy";
           let isAuthenticated = undefined;
           if (isSSE || isHTTP) {
             const authProvider = new ClaudeAuthProvider(client_0.name, client_0.config);
@@ -466421,7 +466445,7 @@ function MCPSettings(t0) {
           if (isClaudeAIProxy) {
             return {
               ...baseInfo,
-              transport: "claudeai-proxy",
+              transport: "ainative-proxy",
               isAuthenticated: false,
               config: client_0.config
             };
@@ -466544,7 +466568,7 @@ function MCPSettings(t0) {
         t9 = $3[25];
       }
       const serverTools_0 = t9;
-      const defaultTab = viewState.server.transport === "claudeai-proxy" ? "AINative" : "Cody CLI";
+      const defaultTab = viewState.server.transport === "ainative-proxy" ? "AINative" : "Cody CLI";
       if (viewState.server.transport === "stdio") {
         let t10;
         if ($3[26] !== viewState.server) {
@@ -474628,12 +474652,12 @@ function ManagePlugins({
         onComplete: handleMcpComplete,
         borderless: true
       }, undefined, false, undefined, this);
-    } else if (configType === "claudeai-proxy") {
+    } else if (configType === "ainative-proxy") {
       const server_2 = {
         name: client_3.name,
         client: client_3,
         scope: scope_5,
-        transport: "claudeai-proxy",
+        transport: "ainative-proxy",
         isAuthenticated: undefined,
         config: client_3.config
       };
@@ -474685,7 +474709,7 @@ function ManagePlugins({
         name: client_4.name,
         client: client_4,
         scope: scope_6,
-        transport: "claudeai-proxy",
+        transport: "ainative-proxy",
         isAuthenticated: undefined,
         config: client_4.config
       };
@@ -474744,7 +474768,7 @@ function ManagePlugins({
         name: client_5.name,
         client: client_5,
         scope: scope_7,
-        transport: "claudeai-proxy",
+        transport: "ainative-proxy",
         isAuthenticated: undefined,
         config: client_5.config
       };
@@ -481913,7 +481937,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "0.7.15") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "0.7.35") {
   if (false) {}
   const cachedChangelog = await getStoredChangelog();
   if (lastSeenVersion !== currentVersion || !cachedChangelog) {
@@ -481926,7 +481950,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "0.7.15")
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "0.7.15") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "0.7.35") {
   if (false) {}
   const releaseNotes = getRecentReleaseNotes(currentVersion, lastSeenVersion);
   return {
@@ -483082,7 +483106,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version6 = process.env.DEMO_VERSION ?? "0.7.15";
+  const version6 = process.env.DEMO_VERSION ?? "0.7.35";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/claude" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -484502,7 +484526,7 @@ function LogoV2() {
   if ($3[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig = getGlobalConfig();
-      if (currentConfig.lastReleaseNotesSeen === "0.7.15") {
+      if (currentConfig.lastReleaseNotesSeen === "0.7.35") {
         return;
       }
       saveGlobalConfig(_temp329);
@@ -485178,12 +485202,12 @@ function LogoV2() {
   return t41;
 }
 function _temp329(current) {
-  if (current.lastReleaseNotesSeen === "0.7.15") {
+  if (current.lastReleaseNotesSeen === "0.7.35") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "0.7.15"
+    lastReleaseNotesSeen: "0.7.35"
   };
 }
 function _temp245(s_0) {
@@ -485808,6 +485832,8 @@ var init_statusNoticeDefinitions = __esm(() => {
     id: "claude-ai-external-token",
     type: "warning",
     isActive: () => {
+      if ((process.env.ANTHROPIC_BASE_URL || "").includes("ainative.studio"))
+        return false;
       const authTokenInfo = getAuthTokenSource();
       return isActiveSubscriber() && (authTokenInfo.source === "ANTHROPIC_AUTH_TOKEN" || authTokenInfo.source === "apiKeyHelper");
     },
@@ -485839,6 +485865,8 @@ var init_statusNoticeDefinitions = __esm(() => {
     id: "api-key-conflict",
     type: "warning",
     isActive: () => {
+      if ((process.env.ANTHROPIC_BASE_URL || "").includes("ainative.studio"))
+        return false;
       const {
         source: apiKeySource
       } = getAnthropicApiKeyWithSource({
@@ -485878,6 +485906,8 @@ var init_statusNoticeDefinitions = __esm(() => {
     id: "both-auth-methods",
     type: "warning",
     isActive: () => {
+      if ((process.env.ANTHROPIC_BASE_URL || "").includes("ainative.studio"))
+        return false;
       const {
         source: apiKeySource
       } = getAnthropicApiKeyWithSource({
@@ -508880,62 +508910,8 @@ var init_DescriptionStep = __esm(() => {
 });
 
 // src/components/agents/generateAgent.ts
-async function generateAgentViaChatCompletions(userPrompt, systemPromptText, existingIdentifiers) {
-  const baseUrl = process.env.ANTHROPIC_BASE_URL || "https://api.ainative.studio";
-  const apiKey = process.env.AINATIVE_API_KEY || process.env.ANTHROPIC_API_KEY || "";
-  const existingList = existingIdentifiers.length > 0 ? `
-
-IMPORTANT: The following identifiers already exist and must NOT be used: ${existingIdentifiers.join(", ")}` : "";
-  const resp = await fetch(`${baseUrl}/api/v1/chat/completions`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "x-api-key": apiKey
-    },
-    body: JSON.stringify({
-      model: "claude-sonnet-4-5",
-      max_tokens: 4096,
-      messages: [
-        { role: "system", content: systemPromptText },
-        {
-          role: "user",
-          content: `Create an agent configuration based on this request: "${userPrompt}".${existingList}
-  Return ONLY the JSON object, no other text.`
-        }
-      ]
-    })
-  });
-  if (!resp.ok) {
-    throw new Error(`Chat completions error: ${resp.status}`);
-  }
-  const data = await resp.json();
-  const content = data.choices?.[0]?.message?.content;
-  const text2 = Array.isArray(content) ? content.join("") : String(content ?? "");
-  let parsed;
-  try {
-    parsed = jsonParse(text2.trim());
-  } catch {
-    const jsonMatch = text2.match(/\{[\s\S]*\}/);
-    if (!jsonMatch)
-      throw new Error("No JSON object found in response");
-    parsed = jsonParse(jsonMatch[0]);
-  }
-  if (!parsed.identifier || !parsed.whenToUse || !parsed.systemPrompt) {
-    throw new Error("Invalid agent configuration generated");
-  }
-  return parsed;
-}
 async function generateAgent(userPrompt, model, existingIdentifiers, abortSignal) {
   const systemPromptText = isAutoMemoryEnabled() ? AGENT_CREATION_SYSTEM_PROMPT + AGENT_MEMORY_INSTRUCTIONS : AGENT_CREATION_SYSTEM_PROMPT;
-  if (isAINativeProvider()) {
-    try {
-      const result = await generateAgentViaChatCompletions(userPrompt, systemPromptText, existingIdentifiers);
-      logEvent("tengu_agent_definition_generated", {
-        agent_identifier: result.identifier
-      });
-      return result;
-    } catch {}
-  }
   const existingList = existingIdentifiers.length > 0 ? `
 
 IMPORTANT: The following identifiers already exist and must NOT be used: ${existingIdentifiers.join(", ")}` : "";
@@ -508975,7 +508951,11 @@ IMPORTANT: The following identifiers already exist and must NOT be used: ${exist
     parsed = jsonParse(jsonMatch[0]);
   }
   if (!parsed.identifier || !parsed.whenToUse || !parsed.systemPrompt) {
-    throw new Error("Invalid agent configuration generated");
+    throw new Error(`Invalid agent configuration generated. Missing fields: ${[
+      !parsed.identifier && "identifier",
+      !parsed.whenToUse && "whenToUse",
+      !parsed.systemPrompt && "systemPrompt"
+    ].filter(Boolean).join(", ")}. Response: ${responseText.slice(0, 500)}`);
   }
   logEvent("tengu_agent_definition_generated", {
     agent_identifier: parsed.identifier
@@ -509014,7 +508994,6 @@ var init_generateAgent = __esm(() => {
   init_constants3();
   init_api3();
   init_messages3();
-  init_model();
   init_paths();
   init_analytics();
   init_slowOperations();
@@ -511521,7 +511500,7 @@ async function captureMemoryDiagnostics(trigger, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "0.7.15"
+    ccVersion: "0.7.35"
   };
 }
 async function performHeapDump(trigger = "manual", dumpNumber = 0) {
@@ -512049,7 +512028,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"0.7.15"} (built ${"1777195198"})`
+    value: `${"0.7.35"} (built ${"1777670343"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -516403,7 +516382,7 @@ var init_statusline = __esm(() => {
     aliases: [],
     name: "statusline",
     progressMessage: "setting up statusLine",
-    allowedTools: [AGENT_TOOL_NAME, "Read(~/**)", "Edit(~/.claude/settings.json)"],
+    allowedTools: [AGENT_TOOL_NAME, "Read(~/**)", "Edit(~/.cody/settings.json)", "Edit(~/.cody/statusline-command.sh)", "Write(~/.cody/statusline-command.sh)"],
     source: "builtin",
     disableNonInteractive: true,
     async getPromptForCommand(args) {
@@ -520996,7 +520975,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version7 = typeof MACRO !== "undefined" ? "0.7.15" : "unknown";
+  const version7 = typeof MACRO !== "undefined" ? "0.7.35" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h2) => h2.sessionCount > 0).map((h2) => h2.name);
   const facets_summary = {
     total: facets.size,
@@ -524942,7 +524921,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION5 = typeof MACRO !== "undefined" ? "0.7.15" : "unknown";
+  VERSION5 = typeof MACRO !== "undefined" ? "0.7.35" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -526147,7 +526126,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes19(16).toString("hex");
-    return join132(getClaudeTempDir(), "bundled-skills", "0.7.15", nonce);
+    return join132(getClaudeTempDir(), "bundled-skills", "0.7.35", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -532119,7 +532098,7 @@ function computeFingerprint(messageText, version7) {
 }
 function computeFingerprintFromMessages(messages) {
   const firstMessageText = extractFirstMessageText(messages);
-  return computeFingerprint(firstMessageText, "0.7.15");
+  return computeFingerprint(firstMessageText, "0.7.35");
 }
 var FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = () => {};
@@ -532615,7 +532594,20 @@ function stripExcessMediaItems(messages, limit) {
 }
 async function* ainativeBypass(messages, systemPrompt, model, toolSchemas, signal) {
   const baseUrl = getBaseURLForModel(model);
-  const apiKey = getApiKeyForModel(model);
+  let authHeaders;
+  let apiKey = null;
+  try {
+    apiKey = getApiKeyForModel(model);
+  } catch {}
+  if (apiKey) {
+    authHeaders = { "x-api-key": apiKey };
+  } else {
+    const oauthToken = getClaudeAIOAuthTokens()?.accessToken;
+    if (!oauthToken) {
+      throw new Error("No API key or OAuth token found. Log in with `cody login`.");
+    }
+    authHeaders = { Authorization: `Bearer ${oauthToken}` };
+  }
   const chatMessages = [];
   const sysText = systemPrompt.join(`
 `);
@@ -532708,7 +532700,7 @@ async function* ainativeBypass(messages, systemPrompt, model, toolSchemas, signa
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      "x-api-key": apiKey,
+      ...authHeaders,
       "anthropic-version": "2023-06-01"
     },
     body: JSON.stringify(anthropicBody),
@@ -534168,7 +534160,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText = extractFirstUserMessageText(messages);
-  const fingerprint = computeFingerprint(messageText, "0.7.15");
+  const fingerprint = computeFingerprint(messageText, "0.7.35");
   const attributionHeader = getAttributionHeader(fingerprint);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -538750,7 +538742,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c6) => c6.userInvocable !== false).map((c6) => c6.name),
     apiKeySource: getAnthropicApiKeyWithSource().source,
     betas: getSdkBetas(),
-    claude_code_version: "0.7.15",
+    claude_code_version: "0.7.35",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent) => agent.agentType),
     skills: inputs.skills.filter((s) => s.userInvocable !== false).map((skill) => skill.name),
@@ -553302,7 +553294,7 @@ var init_useVoiceEnabled = __esm(() => {
 function getSemverPart(version7) {
   return `${import_semver13.major(version7, { loose: true })}.${import_semver13.minor(version7, { loose: true })}.${import_semver13.patch(version7, { loose: true })}`;
 }
-function useUpdateNotification(updatedVersion, initialVersion = "0.7.15") {
+function useUpdateNotification(updatedVersion, initialVersion = "0.7.35") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react226.useState(() => getSemverPart(initialVersion));
   if (!updatedVersion) {
     return null;
@@ -553342,7 +553334,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "0.7.15";
+    const currentVersion = "0.7.35";
     const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel);
     const isDisabled = isAutoUpdaterDisabled();
@@ -553555,12 +553547,12 @@ function NativeAutoUpdater({
     logEvent("tengu_native_auto_updater_start", {});
     try {
       const maxVersion = await getMaxVersion();
-      if (maxVersion && gt("0.7.15", maxVersion)) {
+      if (maxVersion && gt("0.7.35", maxVersion)) {
         const msg = await getMaxVersionMessage();
         setMaxVersionIssue(msg ?? "affects your version");
       }
       const result = await installLatest(channel);
-      const currentVersion = "0.7.15";
+      const currentVersion = "0.7.35";
       const latencyMs = Date.now() - startTime;
       if (result.lockFailed) {
         logEvent("tengu_native_auto_updater_lock_contention", {
@@ -553697,17 +553689,17 @@ function PackageManagerAutoUpdater(t0) {
       const maxVersion = await getMaxVersion();
       if (maxVersion && latest && gt(latest, maxVersion)) {
         logForDebugging(`PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`);
-        if (gte("0.7.15", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.7.15"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("0.7.35", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.7.35"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("0.7.15", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("0.7.35", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.7.15"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.7.35"} -> ${latest}`);
       }
     };
     $3[0] = t1;
@@ -553741,7 +553733,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "0.7.15"
+        "0.7.35"
       ]
     }, undefined, true, undefined, this);
     $3[3] = verbose;
@@ -561851,7 +561843,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "0.7.15",
+    version: "0.7.35",
     output_style: {
       name: outputStyleName
     },
@@ -573239,7 +573231,7 @@ async function submitTranscriptShare(messages, trigger, appearanceId) {
     } catch {}
     const data = {
       trigger,
-      version: "0.7.15",
+      version: "0.7.35",
       platform: process.platform,
       transcript,
       subagentTranscripts: Object.keys(subagentTranscripts).length > 0 ? subagentTranscripts : undefined,
@@ -577001,7 +576993,7 @@ function useMcpConnectivityStatus(t0) {
       }
       if (failedClaudeAiClients.length > 0) {
         addNotification({
-          key: "mcp-claudeai-failed",
+          key: "mcp-ainative-failed",
           jsx: /* @__PURE__ */ jsx_dev_runtime452.jsxDEV(jsx_dev_runtime452.Fragment, {
             children: [
               /* @__PURE__ */ jsx_dev_runtime452.jsxDEV(ThemedText, {
@@ -577051,7 +577043,7 @@ function useMcpConnectivityStatus(t0) {
       }
       if (needsAuthClaudeAiServers.length > 0) {
         addNotification({
-          key: "mcp-claudeai-needs-auth",
+          key: "mcp-ainative-needs-auth",
           jsx: /* @__PURE__ */ jsx_dev_runtime452.jsxDEV(jsx_dev_runtime452.Fragment, {
             children: [
               /* @__PURE__ */ jsx_dev_runtime452.jsxDEV(ThemedText, {
@@ -577087,23 +577079,23 @@ function useMcpConnectivityStatus(t0) {
   import_react301.useEffect(t2, t3);
 }
 function _temp442(client_2) {
-  return client_2.type === "needs-auth" && client_2.config.type === "claudeai-proxy" && hasClaudeAiMcpEverConnected(client_2.name);
+  return client_2.type === "needs-auth" && client_2.config.type === "ainative-proxy" && hasAINativeMcpEverConnected(client_2.name);
 }
 function _temp355(client_1) {
-  return client_1.type === "needs-auth" && client_1.config.type !== "claudeai-proxy";
+  return client_1.type === "needs-auth" && client_1.config.type !== "ainative-proxy";
 }
 function _temp287(client_0) {
-  return client_0.type === "failed" && client_0.config.type === "claudeai-proxy" && hasClaudeAiMcpEverConnected(client_0.name);
+  return client_0.type === "failed" && client_0.config.type === "ainative-proxy" && hasAINativeMcpEverConnected(client_0.name);
 }
 function _temp208(client4) {
-  return client4.type === "failed" && client4.config.type !== "sse-ide" && client4.config.type !== "ws-ide" && client4.config.type !== "claudeai-proxy";
+  return client4.type === "failed" && client4.config.type !== "sse-ide" && client4.config.type !== "ws-ide" && client4.config.type !== "ainative-proxy";
 }
 var import_compiler_runtime351, import_react301, jsx_dev_runtime452, EMPTY_MCP_CLIENTS;
 var init_useMcpConnectivityStatus = __esm(() => {
   init_notifications();
   init_state();
   init_ink2();
-  init_claudeai();
+  init_ainative();
   import_compiler_runtime351 = __toESM(require_compiler_runtime(), 1);
   import_react301 = __toESM(require_react(), 1);
   jsx_dev_runtime452 = __toESM(require_jsx_dev_runtime(), 1);
@@ -585256,7 +585248,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "0.7.15",
+              "0.7.35",
               " "
             ]
           }, undefined, true, undefined, this)
@@ -586557,7 +586549,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "0.7.15"
+    lastOnboardingVersion: "0.7.35"
   }));
 }
 function showDialog(root2, renderer) {
@@ -591035,7 +591027,7 @@ function appendToLog(path28, message) {
     cwd: getFsImplementation().cwd(),
     userType: "external",
     sessionId: getSessionId(),
-    version: "0.7.15"
+    version: "0.7.35"
   };
   getLogWriter(path28).write(messageWithTimestamp);
 }
@@ -594994,8 +594986,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("0.7.15", cfg.min_version)) {
-    return `Your version of Cody CLI (${"0.7.15"}) is too old for Remote Control.
+  if (cfg.min_version && lt("0.7.35", cfg.min_version)) {
+    return `Your version of Cody CLI (${"0.7.35"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`claude update\` to update.`;
   }
   return null;
@@ -595469,7 +595461,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "0.7.15",
+    runnerVersion: "0.7.35",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -597931,9 +597923,9 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands, tools, initial
           headers: connection.config.headers,
           oauth: connection.config.oauth
         };
-      } else if (connection.config.type === "claudeai-proxy") {
+      } else if (connection.config.type === "ainative-proxy") {
         config4 = {
-          type: "claudeai-proxy",
+          type: "ainative-proxy",
           url: connection.config.url,
           id: connection.config.id
         };
@@ -601106,7 +601098,7 @@ async function startMCPServer(cwd3, debug2, verbose) {
   setCwd(cwd3);
   const server = new Server({
     name: "claude/tengu",
-    version: "0.7.15"
+    version: "0.7.35"
   }, {
     capabilities: {
       tools: {}
@@ -601472,7 +601464,7 @@ async function mcpListHandler() {
         console.log(`${name3}: ${server.url} (SSE) - ${status2}`);
       } else if (server.type === "http") {
         console.log(`${name3}: ${server.url} (HTTP) - ${status2}`);
-      } else if (server.type === "claudeai-proxy") {
+      } else if (server.type === "ainative-proxy") {
         console.log(`${name3}: ${server.url} - ${status2}`);
       } else if (!server.type || server.type === "stdio") {
         const args = Array.isArray(server.args) ? server.args : [];
@@ -602717,7 +602709,7 @@ __export(exports_update, {
 });
 async function update() {
   logEvent("tengu_update_check", {});
-  writeToStdout(`Current version: ${"0.7.15"}
+  writeToStdout(`Current version: ${"0.7.35"}
 `);
   const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
   writeToStdout(`Checking for updates to ${channel} version...
@@ -602792,8 +602784,8 @@ async function update() {
       writeToStdout(`Cody CLI is managed by Homebrew.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.7.15", latest)) {
-        writeToStdout(`Update available: ${"0.7.15"} → ${latest}
+      if (latest && !gte("0.7.35", latest)) {
+        writeToStdout(`Update available: ${"0.7.35"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -602809,8 +602801,8 @@ async function update() {
       writeToStdout(`Cody CLI is managed by winget.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.7.15", latest)) {
-        writeToStdout(`Update available: ${"0.7.15"} → ${latest}
+      if (latest && !gte("0.7.35", latest)) {
+        writeToStdout(`Update available: ${"0.7.35"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -602826,8 +602818,8 @@ async function update() {
       writeToStdout(`Cody CLI is managed by apk.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.7.15", latest)) {
-        writeToStdout(`Update available: ${"0.7.15"} → ${latest}
+      if (latest && !gte("0.7.35", latest)) {
+        writeToStdout(`Update available: ${"0.7.35"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -602892,11 +602884,11 @@ async function update() {
 `);
         await gracefulShutdown(1);
       }
-      if (result.latestVersion === "0.7.15") {
-        writeToStdout(source_default.green(`Cody CLI is up to date (${"0.7.15"})`) + `
+      if (result.latestVersion === "0.7.35") {
+        writeToStdout(source_default.green(`Cody CLI is up to date (${"0.7.35"})`) + `
 `);
       } else {
-        writeToStdout(source_default.green(`Successfully updated from ${"0.7.15"} to version ${result.latestVersion}`) + `
+        writeToStdout(source_default.green(`Successfully updated from ${"0.7.35"} to version ${result.latestVersion}`) + `
 `);
         await regenerateCompletionCache();
       }
@@ -602956,12 +602948,12 @@ async function update() {
 `);
     await gracefulShutdown(1);
   }
-  if (latestVersion === "0.7.15") {
-    writeToStdout(source_default.green(`Cody CLI is up to date (${"0.7.15"})`) + `
+  if (latestVersion === "0.7.35") {
+    writeToStdout(source_default.green(`Cody CLI is up to date (${"0.7.35"})`) + `
 `);
     await gracefulShutdown(0);
   }
-  writeToStdout(`New version available: ${latestVersion} (current: ${"0.7.15"})
+  writeToStdout(`New version available: ${latestVersion} (current: ${"0.7.35"})
 `);
   writeToStdout(`Installing update...
 `);
@@ -603006,7 +602998,7 @@ async function update() {
   logForDebugging(`update: Installation status: ${status2}`);
   switch (status2) {
     case "success":
-      writeToStdout(source_default.green(`Successfully updated from ${"0.7.15"} to version ${latestVersion}`) + `
+      writeToStdout(source_default.green(`Successfully updated from ${"0.7.35"} to version ${latestVersion}`) + `
 `);
       await regenerateCompletionCache();
       break;
@@ -603852,7 +603844,7 @@ ${hint}` : hint;
       console.error(warning);
     });
     assertMinVersion();
-    const claudeaiConfigPromise = isNonInteractiveSession && !strictMcpConfig && !doesEnterpriseMcpConfigExist() && !isBareMode() && process.env.CODY_CLI !== "1" ? fetchClaudeAIMcpConfigsIfEligible().then((configs) => {
+    const ainativeConfigPromise = isNonInteractiveSession && !strictMcpConfig && !doesEnterpriseMcpConfigExist() && !isBareMode() && process.env.CODY_CLI !== "1" ? fetchAINativeMcpConfigsIfEligible().then((configs) => {
       const {
         allowed,
         blocked
@@ -604194,19 +604186,19 @@ ${customInstructions}` : customInstructions;
       tools: [],
       commands: []
     }) : prefetchAllMcpResources(regularMcpConfigs);
-    const claudeaiMcpPromise = isNonInteractiveSession ? Promise.resolve({
+    const ainativeMcpPromise = isNonInteractiveSession ? Promise.resolve({
       clients: [],
       tools: [],
       commands: []
-    }) : claudeaiConfigPromise.then((configs) => Object.keys(configs).length > 0 ? prefetchAllMcpResources(configs) : {
+    }) : ainativeConfigPromise.then((configs) => Object.keys(configs).length > 0 ? prefetchAllMcpResources(configs) : {
       clients: [],
       tools: [],
       commands: []
     });
-    const mcpPromise = Promise.all([localMcpPromise, claudeaiMcpPromise]).then(([local, claudeai]) => ({
-      clients: [...local.clients, ...claudeai.clients],
-      tools: uniqBy_default([...local.tools, ...claudeai.tools], "name"),
-      commands: uniqBy_default([...local.commands, ...claudeai.commands], "name")
+    const mcpPromise = Promise.all([localMcpPromise, ainativeMcpPromise]).then(([local, ainative]) => ({
+      clients: [...local.clients, ...ainative.clients],
+      tools: uniqBy_default([...local.tools, ...ainative.tools], "name"),
+      commands: uniqBy_default([...local.commands, ...ainative.commands], "name")
     }));
     const hooksPromise = initOnly || init2 || maintenance || isNonInteractiveSession || options.continue || options.resume ? null : processSessionStartHooks("startup", {
       agentType: mainThreadAgentDefinition?.agentType,
@@ -604251,7 +604243,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "0.7.15",
+      version: "0.7.35",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -604398,21 +604390,21 @@ ${customInstructions}` : customInstructions;
       profileCheckpoint("before_connectMcp");
       await connectMcpBatch(regularMcpConfigs, "regular");
       profileCheckpoint("after_connectMcp");
-      const CLAUDE_AI_MCP_TIMEOUT_MS = 5000;
-      const claudeaiConnect = claudeaiConfigPromise.then((claudeaiConfigs) => {
-        if (Object.keys(claudeaiConfigs).length > 0) {
-          const claudeaiSigs = new Set;
-          for (const config4 of Object.values(claudeaiConfigs)) {
+      const AINATIVE_MCP_TIMEOUT_MS = 5000;
+      const ainativeConnect = ainativeConfigPromise.then((ainativeConfigs) => {
+        if (Object.keys(ainativeConfigs).length > 0) {
+          const ainativeSigs = new Set;
+          for (const config4 of Object.values(ainativeConfigs)) {
             const sig = getMcpServerSignature(config4);
             if (sig)
-              claudeaiSigs.add(sig);
+              ainativeSigs.add(sig);
           }
           const suppressed = new Set;
           for (const [name3, config4] of Object.entries(regularMcpConfigs)) {
             if (!name3.startsWith("plugin:"))
               continue;
             const sig = getMcpServerSignature(config4);
-            if (sig && claudeaiSigs.has(sig))
+            if (sig && ainativeSigs.has(sig))
               suppressed.add(name3);
           }
           if (suppressed.size > 0) {
@@ -604451,20 +604443,20 @@ ${customInstructions}` : customInstructions;
         }
         const nonPluginConfigs = pickBy_default(regularMcpConfigs, (_2, n3) => !n3.startsWith("plugin:"));
         const {
-          servers: dedupedClaudeAi
-        } = dedupClaudeAiMcpServers(claudeaiConfigs, nonPluginConfigs);
-        return connectMcpBatch(dedupedClaudeAi, "claudeai");
+          servers: dedupedAINative
+        } = dedupAINativeMcpServers(ainativeConfigs, nonPluginConfigs);
+        return connectMcpBatch(dedupedAINative, "ainative");
       });
-      let claudeaiTimer;
-      const claudeaiTimedOut = await Promise.race([claudeaiConnect.then(() => false), new Promise((resolve43) => {
-        claudeaiTimer = setTimeout((r) => r(true), CLAUDE_AI_MCP_TIMEOUT_MS, resolve43);
+      let ainativeTimer;
+      const ainativeTimedOut = await Promise.race([ainativeConnect.then(() => false), new Promise((resolve43) => {
+        ainativeTimer = setTimeout((r) => r(true), AINATIVE_MCP_TIMEOUT_MS, resolve43);
       })]);
-      if (claudeaiTimer)
-        clearTimeout(claudeaiTimer);
-      if (claudeaiTimedOut) {
-        logForDebugging(`[MCP] claude.ai connectors not ready after ${CLAUDE_AI_MCP_TIMEOUT_MS}ms — proceeding; background connection continues`);
+      if (ainativeTimer)
+        clearTimeout(ainativeTimer);
+      if (ainativeTimedOut) {
+        logForDebugging(`[MCP] claude.ai connectors not ready after ${AINATIVE_MCP_TIMEOUT_MS}ms — proceeding; background connection continues`);
       }
-      profileCheckpoint("after_connectMcp_claudeai");
+      profileCheckpoint("after_connectMcp_ainative");
       if (!isBareMode()) {
         startDeferredPrefetches();
         Promise.resolve().then(() => (init_backgroundHousekeeping(), exports_backgroundHousekeeping)).then((m2) => m2.startBackgroundHousekeeping());
@@ -604545,6 +604537,15 @@ ${customInstructions}` : customInstructions;
         priority: "high"
       });
     }
+    const ripgrepWarning = getRipgrepMissingWarning();
+    if (ripgrepWarning) {
+      initialNotifications.push({
+        key: "ripgrep-missing-warning",
+        text: ripgrepWarning,
+        color: "warning",
+        priority: "high"
+      });
+    }
     const effectiveToolPermissionContext = {
       ...toolPermissionContext,
       mode: isAgentSwarmsEnabled() && getTeammateUtils().isPlanModeRequired() ? "plan" : toolPermissionContext.mode
@@ -605019,7 +605020,7 @@ Usage: cody --remote "your task description"`, () => gracefulShutdown(1));
     } else {
       const pendingHookMessages = hooksPromise && hookMessages.length === 0 ? hooksPromise : undefined;
       profileCheckpoint("action_after_hooks");
-      console.log(getWelcomeMessage("0.7.15"));
+      console.log(getWelcomeMessage("0.7.35"));
       maybeActivateProactive(options);
       maybeActivateBrief(options);
       if (false) {}
@@ -605036,10 +605037,10 @@ Usage: cody --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("0.7.15 (Cody CLI)", "-v, --version", "Output the version number");
+  }).version("0.7.35 (Cody CLI)", "-v, --version", "Output the version number");
   program2.configureOutput({
     writeOut: (str2) => {
-      if (str2.includes("0.7.15")) {
+      if (str2.includes("0.7.35")) {
         process.stdout.write(getCodyLogo() + `
 ` + str2);
       } else {
@@ -605138,7 +605139,7 @@ Usage: cody --remote "your task description"`, () => gracefulShutdown(1));
   if (false) {}
   if (false) {}
   const auth2 = program2.command("auth").description("Manage authentication").configureHelp(createSortedHelpConfig());
-  auth2.command("login").description("Sign in to your AINative account").option("--email <email>", "Pre-populate email address on the login page").option("--sso", "Force SSO login flow").option("--console", "Use AINative Console (API usage billing)").option("--claudeai", "Use AINative subscription (default)").action(async ({
+  auth2.command("login").description("Sign in to your AINative account").option("--email <email>", "Pre-populate email address on the login page").option("--sso", "Force SSO login flow").option("--console", "Use AINative Console (API usage billing)").option("--ainative", "Use AINative subscription (default)").action(async ({
     email: email3,
     sso,
     console: useConsole,
@@ -605489,7 +605490,7 @@ var init_main3 = __esm(() => {
   init_addCommand();
   init_xaaIdpCommand();
   init_internalLogging();
-  init_claudeai();
+  init_ainative();
   init_client8();
   init_config3();
   init_utils5();
@@ -605596,7 +605597,7 @@ async function main2() {
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
     const { getCodyLogo: getCodyLogo2 } = await Promise.resolve().then(() => (init_branding(), exports_branding));
     console.log(getCodyLogo2() + `
-0.7.15 (Cody CLI)`);
+0.7.35 (Cody CLI)`);
     return;
   }
   const {