feat(vscode): reorganize settings (#2501)

* feat(vscode): reorganize settings

* fix

* update

* clean

clients/vscode/package.json

@@ -129,7 +129,7 @@
       "commandPalette": [
         {
           "command": "tabby.inlineCompletion.trigger",
-          "when": "config.tabby.inlineCompletion.triggerMode === 'manual' && !editorHasSelection && !inlineSuggestionsVisible"
+          "when": "tabby.inlineCompletionTriggerMode === 'manual' && !editorHasSelection && !inlineSuggestionsVisible"
         },
         {
           "command": "tabby.openTabbyAgentSettings",
@@ -234,26 +234,13 @@
       {
         "title": "Tabby",
         "properties": {
-          "tabby.api.endpoint": {
+          "tabby.endpoint": {
             "type": "string",
             "default": "",
             "pattern": "(^$)|(^https?:\\/\\/\\S+$)",
             "patternErrorMessage": "Please enter a validate http or https URL.",
             "markdownDescription": "Specify the API endpoint for the Tabby server.  \nIf authentication is required, please [Set Credentials](command:tabby.setApiToken).  \nIf left empty, the server endpoint specified in the [Tabby Agent Settings](command:tabby.openTabbyAgentSettings) will be used."
           },
-          "tabby.inlineCompletion.triggerMode": {
-            "type": "string",
-            "enum": [
-              "automatic",
-              "manual"
-            ],
-            "default": "automatic",
-            "description": "Select the code completion trigger mode.",
-            "enumDescriptions": [
-              "Automatic trigger when you stop typing",
-              "Manual trigger by pressing `Alt + \\`"
-            ]
-          },
           "tabby.keybindings": {
             "type": "string",
             "enum": [
@@ -263,14 +250,28 @@
             "default": "vscode-style",
             "markdownDescription": "Select the keybinding profile to accept inline completion. You can also customize it in [Keyboard Shortcuts](command:tabby.openKeybindings). \n | | Next Line | Full Completion | Next Word | \n |:---|:---|:---|:---| \n | _vscode-style_ | - | `Tab` | `Ctrl + RightArrow` (macOS: `Cmd + RightArrow`) | \n | _tabby-style_  _(experimental)_ | `Tab` | `Ctrl + Tab` | `Ctrl + RightArrow` (macOS: `Cmd + RightArrow`) | \n"
           },
-          "tabby.usage.anonymousUsageTracking": {
+          "tabby.config.telemetry": {
             "type": "boolean",
             "default": false,
             "markdownDescription": "**Disable anonymous usage tracking**  \nTabby collects aggregated anonymous usage data and sends it to the Tabby team to help improve our products.  \nYour code, generated completions, or any identifying information is never tracked or transmitted.  \nFor more details on data collection, please check our [online documentation](https://tabby.tabbyml.com/docs/extensions/configurations#usage-collection)."
           },
-          "tabby.experimental": {
+          "tabby.settings.advanced": {
             "default": {},
-            "properties": {}
+            "properties": {
+              "inlineCompletion.triggerMode": {
+                "type": "string",
+                "enum": [
+                  "automatic",
+                  "manual"
+                ],
+                "default": "automatic",
+                "description": "Select the code completion trigger mode.",
+                "enumDescriptions": [
+                  "Automatic trigger when you stop typing",
+                  "Manual trigger by pressing `Alt + \\`"
+                ]
+              }
+            }
           }
         }
       }
@@ -279,7 +280,7 @@
       {
         "key": "alt+\\",
         "command": "tabby.inlineCompletion.trigger",
-        "when": "config.tabby.inlineCompletion.triggerMode === 'manual' && editorTextFocus && !editorHasSelection && !inlineSuggestionsVisible"
+        "when": "tabby.inlineCompletionTriggerMode === 'manual' && editorTextFocus && !editorHasSelection && !inlineSuggestionsVisible"
       },
       {
         "command": "tabby.inlineCompletion.accept",

clients/vscode/src/Config.ts

@@ -2,6 +2,10 @@ import { EventEmitter } from "events";
 import { workspace, ExtensionContext, WorkspaceConfiguration, ConfigurationTarget, Memento } from "vscode";
 import { ClientProvidedConfig } from "tabby-agent";
 
+interface AdvancedSettings {
+  "inlineCompletion.triggerMode"?: "automatic" | "manual";
+}
+
 export class Config extends EventEmitter {
   constructor(private readonly context: ExtensionContext) {
     super();
@@ -23,12 +27,12 @@ export class Config extends EventEmitter {
   }
 
   get serverEndpoint(): string {
-    return this.workspace.get("api.endpoint", "");
+    return this.workspace.get("endpoint", "");
   }
 
   set serverEndpoint(value: string) {
     if (value !== this.serverEndpoint) {
-      this.workspace.update("api.endpoint", value, ConfigurationTarget.Global);
+      this.workspace.update("endpoint", value, ConfigurationTarget.Global);
     }
   }
 
@@ -44,12 +48,16 @@ export class Config extends EventEmitter {
   }
 
   get inlineCompletionTriggerMode(): "automatic" | "manual" {
-    return this.workspace.get("inlineCompletion.triggerMode", "automatic");
+    const advancedSettings = this.workspace.get("settings.advanced", {}) as AdvancedSettings;
+    return advancedSettings["inlineCompletion.triggerMode"] || "automatic";
   }
 
   set inlineCompletionTriggerMode(value: "automatic" | "manual") {
     if (value !== this.inlineCompletionTriggerMode) {
-      this.workspace.update("inlineCompletion.triggerMode", value, ConfigurationTarget.Global);
+      const advancedSettings = this.workspace.get("settings.advanced", {}) as AdvancedSettings;
+      const updatedValue = { ...advancedSettings, "inlineCompletion.triggerMode": value };
+      this.workspace.update("settings.advanced", updatedValue, ConfigurationTarget.Global);
+      this.emit("updated");
     }
   }
 
@@ -68,7 +76,7 @@ export class Config extends EventEmitter {
   }
 
   get anonymousUsageTrackingDisabled(): boolean {
-    return this.workspace.get("usage.anonymousUsageTracking", false);
+    return this.workspace.get("config.telemetry", false);
   }
 
   get mutedNotifications(): string[] {

clients/vscode/src/ContextVariables.ts

@@ -1,16 +1,25 @@
 import { commands, window, workspace, Range } from "vscode";
 import { Client } from "./lsp/Client";
+import { Config } from "./Config";
 
 export class ContextVariables {
   private chatEnabledValue = false;
   private chatEditInProgressValue = false;
   private chatEditResolvingValue = false;
+  private inlineCompletionTriggerModeValue: "automatic" | "manual" = "automatic";
 
-  constructor(private readonly client: Client) {
+  constructor(
+    private readonly client: Client,
+    private readonly config: Config,
+  ) {
     this.chatEnabled = this.client.chat.isAvailable;
+    this.inlineCompletionTriggerMode = config.inlineCompletionTriggerMode;
     this.client.chat.on("didChangeAvailability", (params: boolean) => {
       this.chatEnabled = params;
     });
+    this.config.on("updated", () => {
+      this.inlineCompletionTriggerMode = config.inlineCompletionTriggerMode;
+    });
     this.updateChatEditResolving();
     window.onDidChangeTextEditorSelection((params) => {
       if (params.textEditor === window.activeTextEditor) {
@@ -66,4 +75,13 @@ export class ContextVariables {
     commands.executeCommand("setContext", "tabby.chatEditResolving", value);
     this.chatEditResolvingValue = value;
   }
+
+  get inlineCompletionTriggerMode(): "automatic" | "manual" {
+    return this.inlineCompletionTriggerModeValue;
+  }
+
+  set inlineCompletionTriggerMode(value: "automatic" | "manual") {
+    commands.executeCommand("setContext", "tabby.inlineCompletionTriggerMode", value);
+    this.inlineCompletionTriggerModeValue = value;
+  }
 }

clients/vscode/src/extension.ts

@@ -67,7 +67,7 @@ export async function activate(context: ExtensionContext) {
   );
 
   const issues = new Issues(client, config);
-  const contextVariables = new ContextVariables(client);
+  const contextVariables = new ContextVariables(client, config);
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */ /* @ts-expect-error noUnusedLocals */
   const statusBarItem = new StatusBarItem(context, client, config, issues, inlineCompletionProvider);
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */ /* @ts-expect-error noUnusedLocals */