Address comments.

Author: ethanyhou

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/Constants.java

@@ -18,7 +18,6 @@ private Constants() {
 
   public static final String PLUGIN_ID = "com.microsoft.copilot.eclipse";
   public static final String AUTO_SHOW_COMPLETION = "enableAutoCompletions";
-  public static final String USAGE_ALERT_THRESHOLD = "usageAlertThreshold";
   public static final String ENABLE_NEXT_EDIT_SUGGESTION = "enableNextEditSuggestion";
   public static final String ENABLE_STRICT_SSL = "enableStrictSsl";
   public static final String PROXY_KERBEROS_SP = "proxyKerberosSp";

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/CopilotLanguageServerSettings.java

@@ -278,8 +278,6 @@ public static class CopilotSettings {
 
     private CopilotAgentSettings agent;
 
-    private int usageAlertThreshold;
-
     /**
      * Constructor.
      */
@@ -322,29 +320,19 @@ public void setAgent(CopilotAgentSettings agent) {
       this.agent = agent;
     }
 
-    public int getUsageAlertThreshold() {
-      return usageAlertThreshold;
-    }
-
-    public void setUsageAlertThreshold(int usageAlertThreshold) {
-      this.usageAlertThreshold = usageAlertThreshold;
-    }
-
     @Override
     public String toString() {
       ToStringBuilder builder = new ToStringBuilder(this);
       builder.append("mcpServers", mcpServers);
       builder.append("workspaceCopilotInstructions", workspaceCopilotInstructions);
       builder.append("gitCommitCopilotInstructions", gitCommitCopilotInstructions);
       builder.append("agent", agent);
-      builder.append("usageAlertThreshold", usageAlertThreshold);
       return builder.toString();
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(agent, gitCommitCopilotInstructions, mcpServers, usageAlertThreshold,
-          workspaceCopilotInstructions);
+      return Objects.hash(agent, gitCommitCopilotInstructions, mcpServers, workspaceCopilotInstructions);
     }
 
     @Override
@@ -358,7 +346,7 @@ public boolean equals(Object obj) {
       CopilotSettings other = (CopilotSettings) obj;
       return Objects.equals(agent, other.agent)
           && Objects.equals(gitCommitCopilotInstructions, other.gitCommitCopilotInstructions)
-          && Objects.equals(mcpServers, other.mcpServers) && usageAlertThreshold == other.usageAlertThreshold
+          && Objects.equals(mcpServers, other.mcpServers)
           && Objects.equals(workspaceCopilotInstructions, other.workspaceCopilotInstructions);
     }
   }

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/quota/CheckQuotaResult.java

@@ -11,7 +11,17 @@ public class CheckQuotaResult {
   private Quota chat;
   private Quota completions;
   private Quota premiumInteractions;
+
+  /**
+   * Quota usage for the 5-hour rolling interval (session limit). Only included for CFI (Copilot for Individuals)
+   * token-based billing users
+   */
   private TbbQuota immediateUsageInterval;
+
+  /**
+   * Quota usage for the 7-day rolling interval (weekly limit). Only included for CFI (Copilot for Individuals)
+   * token-based billing users (all CFI plans).
+   */
   private TbbQuota extendedUsageInterval;
   private String resetDate;
   private String resetDateUtc;
@@ -101,8 +111,7 @@ public boolean equals(Object obj) {
     CheckQuotaResult other = (CheckQuotaResult) obj;
     return Objects.equals(chat, other.chat) && Objects.equals(completions, other.completions)
         && copilotPlan == other.copilotPlan && Objects.equals(premiumInteractions, other.premiumInteractions)
-        && Objects.equals(resetDate, other.resetDate)
-        && Objects.equals(resetDateUtc, other.resetDateUtc)
+        && Objects.equals(resetDate, other.resetDate) && Objects.equals(resetDateUtc, other.resetDateUtc)
         && Objects.equals(immediateUsageInterval, other.immediateUsageInterval)
         && Objects.equals(extendedUsageInterval, other.extendedUsageInterval);
   }

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/quota/Quota.java

@@ -12,6 +12,8 @@ public class Quota {
   private double percentRemaining;
   private boolean unlimited;
   private boolean overagePermitted;
+  @SerializedName("overage_count")
+  private int overageCount;
   private int entitlement;
   private int quotaRemaining;
   @SerializedName("timeStamp")
@@ -49,6 +51,14 @@ public void setOveragePermitted(boolean overagePermitted) {
     this.overagePermitted = overagePermitted;
   }
 
+  public int getOverageCount() {
+    return overageCount;
+  }
+
+  public void setOverageCount(int overageCount) {
+    this.overageCount = overageCount;
+  }
+
   public int getEntitlement() {
     return entitlement;
   }
@@ -75,7 +85,8 @@ public void setTimestamp(String timestamp) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(entitlement, overagePermitted, percentRemaining, quotaRemaining, timestamp, unlimited);
+    return Objects.hash(entitlement, overagePermitted, overageCount, percentRemaining, quotaRemaining, timestamp,
+        unlimited);
   }
 
   @Override
@@ -89,8 +100,8 @@ public boolean equals(Object obj) {
     Quota other = (Quota) obj;
     return Double.doubleToLongBits(percentRemaining) == Double.doubleToLongBits(other.percentRemaining)
         && unlimited == other.unlimited && overagePermitted == other.overagePermitted
-        && entitlement == other.entitlement && quotaRemaining == other.quotaRemaining
-        && Objects.equals(timestamp, other.timestamp);
+        && overageCount == other.overageCount && entitlement == other.entitlement
+        && quotaRemaining == other.quotaRemaining && Objects.equals(timestamp, other.timestamp);
   }
 
   @Override
@@ -99,6 +110,7 @@ public String toString() {
     builder.append("percentRemaining", percentRemaining);
     builder.append("unlimited", unlimited);
     builder.append("overagePermitted", overagePermitted);
+    builder.append("overageCount", overageCount);
     builder.append("entitlement", entitlement);
     builder.append("quotaRemaining", quotaRemaining);
     builder.append("timestamp", timestamp);

com.microsoft.copilot.eclipse.ui/css/dark.css

@@ -216,6 +216,7 @@
 
 /* Action items in dropdown popups */
 #popup-item-default Label.popup-action-text,
-#popup-item-selected Label.popup-action-text {
+#popup-item-selected Label.popup-action-text,
+#dropdown-popup Label.popup-action-text {
 	color: #74A7DC;
 }

com.microsoft.copilot.eclipse.ui/css/light.css

@@ -216,6 +216,7 @@
 
 /* Action items in dropdown popups */
 #popup-item-default Label.popup-action-text,
-#popup-item-selected Label.popup-action-text {
+#popup-item-selected Label.popup-action-text,
+#dropdown-popup Label.popup-action-text {
 	color: #286EC5;
 }

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/preferences/CopilotPreferenceInitializer.java

@@ -29,7 +29,6 @@ public void initializeDefaultPreferences() {
     pref.setDefault(Constants.CUSTOM_INSTRUCTIONS_WORKSPACE_ENABLED, false);
     pref.setDefault(Constants.CUSTOM_INSTRUCTIONS_WORKSPACE, "");
     pref.setDefault(Constants.AUTO_BREAKPOINT_RESPONSE, false);
-    pref.setDefault(Constants.USAGE_ALERT_THRESHOLD, 90);
     pref.setDefault(Constants.MCP, """
         {
           "servers": {

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/preferences/CopilotPreferencesPage.java

@@ -35,7 +35,7 @@ protected Control createContents(Composite parent) {
         McpPreferencePage.ID);
     PreferencePageUtils.createPreferenceLink(getShell(), container, "<a>Model Management</a>", null,
         ByokPreferencePage.ID);
-    PreferencePageUtils.createPreferenceLink(getShell(), container, "<a>Usage Status</a>", null,
+    PreferencePageUtils.createPreferenceLink(getShell(), container, "<a>Usage</a>", null,
         UsageStatusPreferencePage.ID);
     return container;
   }

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/preferences/LanguageServerSettingManager.java

@@ -75,8 +75,6 @@ public LanguageServerSettingManager(CopilotLanguageServerConnection conn, IProxy
     getSettings().getHttp().setProxyStrictSsl(preferenceStore.getBoolean(Constants.ENABLE_STRICT_SSL));
     getSettings().getHttp().setProxyKerberosServicePrincipal(preferenceStore.getString(Constants.PROXY_KERBEROS_SP));
     getSettings().getGithubEnterprise().setUri(preferenceStore.getString(Constants.GITHUB_ENTERPRISE));
-    getSettings().getGithubSettings().getCopilotSettings()
-        .setUsageAlertThreshold(preferenceStore.getInt(Constants.USAGE_ALERT_THRESHOLD));
 
     // agent related settings
     getSettings().getGithubSettings().getCopilotSettings().getAgent()
@@ -167,11 +165,6 @@ public void propertyChange(PropertyChangeEvent event) {
             .setAgentMaxRequests(preferenceStore.getInt(Constants.AGENT_MAX_REQUESTS));
         singleSetting = new CopilotLanguageServerSettings(null, null, null, settings.getGithubSettings());
         break;
-      case Constants.USAGE_ALERT_THRESHOLD:
-        settings.getGithubSettings().getCopilotSettings()
-            .setUsageAlertThreshold(preferenceStore.getInt(Constants.USAGE_ALERT_THRESHOLD));
-        singleSetting = new CopilotLanguageServerSettings(null, null, null, settings.getGithubSettings());
-        break;
       default:
         return;
     }

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/preferences/Messages.java

@@ -151,34 +151,39 @@ public class Messages extends NLS {
   public static String setting_managed_by_organization;
   public static String setting_disabled_by_organization;
 
-  // Usage Status
-  public static String usage_status_account;
-  public static String usage_status_account_label;
-  public static String usage_status_plan_prefix;
-  public static String usage_status_plan_free;
-  public static String usage_status_plan_pro;
-  public static String usage_status_plan_pro_plus;
-  public static String usage_status_plan_business;
-  public static String usage_status_plan_enterprise;
-  public static String usage_status_plan_unknown;
-  public static String usage_status_upgrade_plan;
-  public static String usage_status_configure_overage;
-  public static String usage_status_copilot_usage;
-  public static String usage_status_session_limit;
-  public static String usage_status_session_limit_description;
-  public static String usage_status_weekly_limit;
-  public static String usage_status_weekly_limit_description;
-  public static String usage_status_monthly_limit;
-  public static String usage_status_not_signed_in;
-  public static String usage_status_no_monthly_limit;
-  public static String usage_status_resets_in;
-  public static String usage_status_resets_on_at;
-  public static String usage_status_alert_threshold;
-  public static String usage_status_duration_hours_mins;
-  public static String usage_status_duration_hour_mins;
-  public static String usage_status_duration_hours;
-  public static String usage_status_duration_hour;
-  public static String usage_status_duration_mins;
+  // Usage
+  public static String usage_plan_free;
+  public static String usage_plan_pro;
+  public static String usage_plan_pro_plus;
+  public static String usage_plan_max;
+  public static String usage_plan_business;
+  public static String usage_plan_enterprise;
+  public static String usage_plan_unknown;
+  public static String usage_upgrade_plan;
+  public static String usage_manage_budget;
+  public static String usage_copilot_usage;
+  public static String usage_session_limit;
+  public static String usage_session_limit_description;
+  public static String usage_weekly_limit;
+  public static String usage_weekly_limit_description;
+  public static String usage_monthly_limit;
+  public static String usage_monthly_limit_description;
+  public static String usage_percentage_suffix;
+  public static String usage_overage_configured;
+  public static String usage_overage_spend_tooltip;
+  public static String usage_overage_not_configured;
+  public static String usage_not_signed_in;
+  public static String usage_no_monthly_limit;
+  public static String usage_no_session_limit;
+  public static String usage_no_weekly_limit;
+  public static String usage_resets_in;
+  public static String usage_resets_on_at;
+  public static String usage_resets_no_usage_yet;
+  public static String usage_duration_hours_mins;
+  public static String usage_duration_hour_mins;
+  public static String usage_duration_hours;
+  public static String usage_duration_hour;
+  public static String usage_duration_mins;
 
   static {
     // initialize resource bundle