continuedev
diff --git a/‎.github/workflows/main.yaml
+16-16 b/‎.github/workflows/main.yaml
+16-16
diff --git a/‎.github/workflows/preview.yaml
+15-15 b/‎.github/workflows/preview.yaml
+15-15
diff --git a/‎core/autocomplete/README.md
+1-1 b/‎core/autocomplete/README.md
+1-1
diff --git a/‎core/config/profile/ControlPlaneProfileLoader.ts
+15-9 b/‎core/config/profile/ControlPlaneProfileLoader.ts
+15-9
diff --git a/‎core/config/types.ts
+1-1 b/‎core/config/types.ts
+1-1
diff --git a/‎core/control-plane/TeamAnalytics.ts
+2-2 b/‎core/control-plane/TeamAnalytics.ts
+2-2
diff --git a/‎core/control-plane/client.ts
+4-6 b/‎core/control-plane/client.ts
+4-6
diff --git a/‎core/index.d.ts
+1-1 b/‎core/index.d.ts
+1-1
diff --git a/‎core/indexing/LanceDbIndex.ts
+1-1 b/‎core/indexing/LanceDbIndex.ts
+1-1
diff --git a/‎core/indexing/ignore.ts
+1 b/‎core/indexing/ignore.ts
+1
diff --git a/‎core/llm/llms/stubs/ContinueProxy.ts
+14-1 b/‎core/llm/llms/stubs/ContinueProxy.ts
+14-1
diff --git a/‎core/package-lock.json
+9 b/‎core/package-lock.json
+9
diff --git a/‎core/package.json
+1 b/‎core/package.json
+1
diff --git a/‎core/protocol/core.ts
+1 b/‎core/protocol/core.ts
+1
diff --git a/‎core/protocol/passThrough.ts
+1 b/‎core/protocol/passThrough.ts
+1
diff --git a/‎core/protocol/webview.ts
+1 b/‎core/protocol/webview.ts
+1
diff --git a/‎core/util/parameters.ts
+1-1 b/‎core/util/parameters.ts
+1-1
diff --git a/‎docs/docs/reference/Model Providers/deepseek.md
+16 b/‎docs/docs/reference/Model Providers/deepseek.md
+16
diff --git a/‎docs/docs/troubleshooting.md
+8-8 b/‎docs/docs/troubleshooting.md
+8-8
diff --git a/‎docs/docs/walkthroughs/set-up-codestral.md
+2-2 b/‎docs/docs/walkthroughs/set-up-codestral.md
+2-2
diff --git a/‎docs/docs/walkthroughs/tab-autocomplete.md
+1-1 b/‎docs/docs/walkthroughs/tab-autocomplete.md
+1-1
@@ -231,22 +231,22 @@ jobs:
           npx ovsx publish -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../alpine-x64/*.vsix ../../darwin-arm64/*.vsix ../../darwin-x64/*.vsix ../../linux-arm64/*.vsix ../../linux-armhf/*.vsix ../../linux-x64/*.vsix ../../win32-x64/*.vsix ../../win32-arm64/*.vsix
 
       # 4. Update the package.json version and push changes
-      - name: Update version in package.json
-        run: |
-          cd extensions/vscode
-          npm version patch
-
-      - name: Commit changes
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git commit -am "💚 Update package.json version [skip ci]"
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+      # - name: Update version in package.json
+      #   run: |
+      #     cd extensions/vscode
+      #     npm version patch
+
+      # - name: Commit changes
+      #   run: |
+      #     git config --local user.email "[email protected]"
+      #     git config --local user.name "GitHub Action"
+      #     git commit -am "💚 Update package.json version [skip ci]"
+
+      # - name: Push changes
+      #   uses: ad-m/github-push-action@master
+      #   with:
+      #     github_token: ${{ secrets.GITHUB_TOKEN }}
+      #     branch: ${{ github.ref }}
 
       # 5 Send to Discord Webhook
       - name: Discord Commits
 
@@ -223,19 +223,19 @@ jobs:
           npx ovsx publish --pre-release -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../alpine-x64/*.vsix ../../darwin-arm64/*.vsix ../../darwin-x64/*.vsix ../../linux-arm64/*.vsix ../../linux-armhf/*.vsix ../../linux-x64/*.vsix ../../win32-x64/*.vsix ../../win32-arm64/*.vsix
 
       # 4. Update the package.json version and push changes
-      - name: Update version in package.json
-        run: |
-          cd extensions/vscode
-          npm version patch
-
-      - name: Commit changes
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git commit -am "💚 Update package.json version [skip ci]"
+      # - name: Update version in package.json
+      #   run: |
+      #     cd extensions/vscode
+      #     npm version patch
 
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+      # - name: Commit changes
+      #   run: |
+      #     git config --local user.email "[email protected]"
+      #     git config --local user.name "GitHub Action"
+      #     git commit -am "💚 Update package.json version [skip ci]"
+
+      # - name: Push changes
+      #   uses: ad-m/github-push-action@master
+      #   with:
+      #     github_token: ${{ secrets.GITHUB_TOKEN }}
+      #     branch: ${{ github.ref }}
@@ -90,7 +90,7 @@ This is just another object like the ones in the `"models"` array of `config.jso
 This object allows you to customize the behavior of tab-autocomplete. The available options are:
 
 - `useCopyBuffer`: Determines whether the copy buffer will be considered when constructing the prompt. (Boolean)
-- `useSuffix`: Determines whether to use the file suffix in the prompt. (Boolean)
+- `useFileSuffix`: Determines whether to use the file suffix in the prompt. (Boolean)
 - `maxPromptTokens`: The maximum number of prompt tokens to use. A smaller number will yield faster completions, but less context. (Number)
 - `debounceDelay`: The delay in milliseconds before triggering autocomplete after a keystroke. (Number)
 - `maxSuffixPercentage`: The maximum percentage of the prompt that can be dedicated to the suffix. (Number)
 
@@ -1,12 +1,13 @@
+import { ConfigJson } from "@continuedev/config-types";
 import {
   ContinueConfig,
   IDE,
   IdeSettings,
   SerializedContinueConfig,
 } from "../..";
 import { ControlPlaneClient } from "../../control-plane/client";
-import { ControlPlaneSettings } from "../../control-plane/schema";
 import { TeamAnalytics } from "../../control-plane/TeamAnalytics";
+import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
 import { Telemetry } from "../../util/posthog";
 import {
   defaultContextProvidersJetBrains,
@@ -26,7 +27,7 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
   readonly profileId: string;
   profileTitle: string;
 
-  workspaceSettings: ControlPlaneSettings | undefined;
+  workspaceSettings: ConfigJson | undefined;
 
   constructor(
     private readonly workspaceId: string,
@@ -55,13 +56,8 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
         this.profileId,
       )) as any);
 
-    // First construct a SerializedContinueConfig from the ControlPlaneSettings
-    const serializedConfig: SerializedContinueConfig = {
-      models: settings.models,
-      tabAutocompleteModel: settings.tabAutocompleteModel,
-      embeddingsProvider: settings.embeddingsModel,
-      reranker: settings.reranker,
-    };
+    // First construct a SerializedContinueConfig from the ControlPlaneSettings (TODO)
+    const serializedConfig: SerializedContinueConfig = settings;
 
     serializedConfig.contextProviders ??=
       ideInfo.ideType === "vscode"
@@ -94,6 +90,16 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
       ideInfo.extensionVersion,
     );
 
+    [
+      ...finalConfig.models,
+      ...(finalConfig.tabAutocompleteModels ?? []),
+    ].forEach(async (model) => {
+      if (model.providerName === "continue-proxy") {
+        const accessToken = await this.controlPlaneClient.getAccessToken();
+        (model as ContinueProxy).workOsAccessToken = accessToken;
+      }
+    });
+
     return finalConfig;
   }
 
 
@@ -676,7 +676,7 @@ declare global {
   export interface TabAutocompleteOptions {
     disable: boolean;
     useCopyBuffer: boolean;
-    useSuffix: boolean;
+    useFileSuffix: boolean;
     maxPromptTokens: number;
     debounceDelay: number;
     maxSuffixPercentage: number;
 
@@ -1,5 +1,5 @@
+import { Analytics } from "@continuedev/config-types";
 import os from "node:os";
-import { ControlPlaneAnalytics } from "./schema";
 
 export class TeamAnalytics {
   static client: any = undefined;
@@ -24,7 +24,7 @@ export class TeamAnalytics {
   }
 
   static async setup(
-    config: ControlPlaneAnalytics,
+    config: Analytics,
     uniqueId: string,
     extensionVersion: string,
   ) {
 
@@ -1,6 +1,6 @@
+import { ConfigJson } from "@continuedev/config-types";
 import fetch, { RequestInit, Response } from "node-fetch";
 import { ModelDescription } from "..";
-import { ControlPlaneSettings } from "./schema";
 
 export interface ControlPlaneSessionInfo {
   accessToken: string;
@@ -13,7 +13,7 @@ export interface ControlPlaneSessionInfo {
 export interface ControlPlaneWorkspace {
   id: string;
   name: string;
-  settings: ControlPlaneSettings;
+  settings: ConfigJson;
 }
 
 export interface ControlPlaneModelDescription extends ModelDescription {}
@@ -40,7 +40,7 @@ export class ControlPlaneClient {
     );
   }
 
-  private async getAccessToken(): Promise<string | undefined> {
+  async getAccessToken(): Promise<string | undefined> {
     return (await this.sessionInfoPromise)?.accessToken;
   }
 
@@ -78,9 +78,7 @@ export class ControlPlaneClient {
     return (await resp.json()) as any;
   }
 
-  async getSettingsForWorkspace(
-    workspaceId: string,
-  ): Promise<ControlPlaneSettings> {
+  async getSettingsForWorkspace(workspaceId: string): Promise<ConfigJson> {
     const userId = await this.userId;
     if (!userId) {
       throw new Error("No user id");
 
@@ -769,7 +769,7 @@ export interface Reranker {
 export interface TabAutocompleteOptions {
   disable: boolean;
   useCopyBuffer: boolean;
-  useSuffix: boolean;
+  useFileSuffix: boolean;
   maxPromptTokens: number;
   debounceDelay: number;
   maxSuffixPercentage: number;
 
@@ -65,7 +65,7 @@ export class LanceDbIndex implements CodebaseIndex {
         "lancedb_sqlite_artifact_id_column",
         async () => {
           await db.exec(
-            `ALTER TABLE lance_db_cache ADD COLUMN artifact_id TEXT NOT NULL DEFAULT 'UNDEFINED'`,
+            "ALTER TABLE lance_db_cache ADD COLUMN artifact_id TEXT NOT NULL DEFAULT 'UNDEFINED'",
           );
           resolve(undefined);
         },
 
@@ -69,6 +69,7 @@ export const DEFAULT_IGNORE_FILETYPES = [
 export const defaultIgnoreFile = ignore().add(DEFAULT_IGNORE_FILETYPES);
 export const DEFAULT_IGNORE_DIRS = [
   ".git",
+  ".svn",
   ".vscode",
   ".idea",
   ".vs",
 
@@ -2,9 +2,22 @@ import type { LLMOptions, ModelProvider } from "../../..";
 import OpenAI from "../OpenAI.js";
 
 class ContinueProxy extends OpenAI {
+  private _workOsAccessToken: string | undefined = undefined;
+
+  get workOsAccessToken(): string | undefined {
+    return this._workOsAccessToken;
+  }
+
+  set workOsAccessToken(value: string | undefined) {
+    if (this._workOsAccessToken !== value) {
+      this._workOsAccessToken = value;
+      this.apiKey = value;
+    }
+  }
   static providerName: ModelProvider = "continue-proxy";
   static defaultOptions: Partial<LLMOptions> = {
-    apiBase: "http://localhost:3000/proxy/v1",
+    apiBase:
+      "https://control-plane-api-service-i3dqylpbqa-uc.a.run.app/model-proxy/v1",
   };
 
   supportsFim(): boolean {
 
@@ -31,6 +31,7 @@
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "^3.574.0",
     "@aws-sdk/credential-providers": "^3.596.0",
+    "@continuedev/config-types": "^1.0.6",
     "@mozilla/readability": "^0.5.0",
     "@octokit/rest": "^20.0.2",
     "@types/jsdom": "^21.1.6",
 
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import type {
   BrowserSerializedContinueConfig,
   ChatMessage,
 
@@ -54,5 +54,6 @@ export const CORE_TO_WEBVIEW_PASS_THROUGH: (keyof ToWebviewFromCoreProtocol)[] =
     "indexProgress",
     "addContextItem",
     "refreshSubmenuItems",
+    "isContinueInputFocused",
     "didChangeAvailableProfiles",
   ];
@@ -5,6 +5,7 @@ export type ToWebviewFromIdeOrCoreProtocol = {
   getDefaultModelTitle: [undefined, string];
   indexProgress: [IndexingProgressUpdate, void];
   refreshSubmenuItems: [undefined, void];
+  isContinueInputFocused: [undefined, boolean];
   addContextItem: [
     {
       historyIndex: number;
 
@@ -3,7 +3,7 @@ import { TabAutocompleteOptions } from "../index.js";
 export const DEFAULT_AUTOCOMPLETE_OPTS: TabAutocompleteOptions = {
   disable: false,
   useCopyBuffer: false,
-  useSuffix: true,
+  useFileSuffix: true,
   maxPromptTokens: 1024,
   prefixPercentage: 0.85,
   maxSuffixPercentage: 0.25,
 
@@ -0,0 +1,16 @@
+# DeepSeek
+
+To setup DeepSeek, obtain an API key from [here](https://www.deepseek.com/) and add the following to your `config.json` file:
+
+```json title="~/.continue/config.json"
+{
+  "models": [
+    {
+      "title": "Deepseek",
+      "provider": "deepseek",
+      "model": "deepseek-code", // Or any other DeepSeek model
+      "apiKey": "YOUR_API_KEY"
+    }
+  ]
+}
+```
@@ -67,11 +67,11 @@ If your keyboard shortcuts are not resolving, you may have other commands that a
 - [VSCode keyboard shortcuts docs](https://code.visualstudio.com/docs/getstarted/keybindings)
 - [IntelliJ keyboard shortcut docs](https://www.jetbrains.com/help/idea/configuring-keyboard-and-mouse-shortcuts.html)
 
-# FAQs
+## FAQs
 
-## Networking Issues
+### Networking Issues
 
-### Configure Certificates
+#### Configure Certificates
 
 If you're seeing a `fetch failed` error and your network requires custom certificates, you will need to configure them in `config.json`. In each of the objects in the `"models"` array, add `requestOptions.caBundlePath` like this:
 
@@ -92,22 +92,22 @@ If you're seeing a `fetch failed` error and your network requires custom certifi
 
 You may also set `requestOptions.caBundlePath` to an array of paths to multiple certificates.
 
-### VS Code Proxy Settings
+#### VS Code Proxy Settings
 
 If you are using VS Code and require requests to be made through a proxy, you are likely already set up through VS Code's [Proxy Server Support](https://code.visualstudio.com/docs/setup/network#_proxy-server-support). To double-check that this is enabled, use cmd/ctrl+, to open settings and search for "Proxy Support". Unless it is set to "off", then VS Code is responsible for making the request to the proxy.
 
-### code-server
+#### code-server
 
 Continue can be used in [code-server](https://coder.com/), but if you are running across an error in the logs that includes "This is likely because the editor is not running in a secure context", please see [their documentation on securely exposing code-server](https://coder.com/docs/code-server/latest/guide#expose-code-server).
 
-## I installed Continue, but don't see the sidebar window
+### I installed Continue, but don't see the sidebar window
 
 By default the Continue window is on the left side of VS Code, but it can be dragged to right side as well, which we recommend in our tutorial. In the situation where you have previously installed Continue and moved it to the right side, it may still be there. You can reveal Continue either by using cmd/ctrl+L or by clicking the button in the top right of VS Code to open the right sidebar.
 
-## I'm getting a 404 error from OpenAI
+### I'm getting a 404 error from OpenAI
 
 If you have entered a valid API key and model, but are still getting a 404 error from OpenAI, this may be because you need to add credits to your billing account. You can do so from the [billing console](https://platform.openai.com/settings/organization/billing/overview). If you just want to check that this is in fact the cause of the error, you can try adding $1 to your account and checking whether the error persists.
 
-# Still having trouble?
+## Still having trouble?
 
 Create a GitHub issue [here](https://github.com/continuedev/continue/issues/new?assignees=&labels=bug&projects=&template=bug-report-%F0%9F%90%9B.md&title=), leaving the details of your problem, and we'll be able to more quickly help you out.
@@ -39,7 +39,7 @@ keywords: [codestral, mistral, model setup]
 
 5. If you run into any issues or have any questions, please join our Discord and post in the `#help` channel [here](https://discord.gg/EfJEfdFnDQ)
 
-## Trobleshooting
+## Troubleshooting
 
 ### Temporary workaround for JetBrains
 
@@ -68,4 +68,4 @@ Mistral AI recently changed the API endpoint to `codestral.mistral.ai` instead o
 
 ### Ask for help on Discord
 
-Please join our Discord and post in the `#help` channel [here](https://discord.gg/EfJEfdFnDQ) if you are having problems using Codestral
+Please join our Discord and post in the `#help` channel [here](https://discord.gg/EfJEfdFnDQ) if you are having problems using Codestral
@@ -94,7 +94,7 @@ This object allows you to customize the behavior of tab-autocomplete. The availa
 - `disable`: Disable autocomplete (can also be done from IDE settings)
 - `template`: An optional template string to be used for autocomplete. It will be rendered with the Mustache templating language, and is passed the 'prefix' and 'suffix' variables. (String)
 - `useCopyBuffer`: Determines whether the copy buffer will be considered when constructing the prompt. (Boolean)
-- `useSuffix`: Determines whether to use the file suffix in the prompt. (Boolean)
+- `useFileSuffix`: Determines whether to use the file suffix in the prompt. (Boolean)
 - `maxPromptTokens`: The maximum number of prompt tokens to use. A smaller number will yield faster completions, but less context. (Number)
 - `prefixPercentage`: The percentage of the input that should be dedicated to the prefix. (Number)
 - `maxSuffixPercentage`: The maximum percentage of the prompt that can be dedicated to the suffix. (Number)
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable @typescript-eslint/naming-convention */`
`1`	`2`	`import type {`
`2`	`3`	`BrowserSerializedContinueConfig,`
`3`	`4`	`ChatMessage,`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ export type ToWebviewFromIdeOrCoreProtocol = {`
`5`	`5`	`getDefaultModelTitle: [undefined, string];`
`6`	`6`	`indexProgress: [IndexingProgressUpdate, void];`
`7`	`7`	`refreshSubmenuItems: [undefined, void];`
	`8`	`+ isContinueInputFocused: [undefined, boolean];`
`8`	`9`	`addContextItem: [`
`9`	`10`	`{`
`10`	`11`	`historyIndex: number;`