Merge pull request #5201 from continuedev/nate/remove-cft

remove cft

Author: sestinj

core/config/ConfigHandler.ts

@@ -4,7 +4,7 @@ import {
   ControlPlaneClient,
   ControlPlaneSessionInfo,
 } from "../control-plane/client.js";
-import { getControlPlaneEnv, useHub } from "../control-plane/env.js";
+import { getControlPlaneEnv } from "../control-plane/env.js";
 import {
   BrowserSerializedContinueConfig,
   ContinueConfig,
@@ -16,7 +16,6 @@ import {
 import { GlobalContext } from "../util/GlobalContext.js";
 
 import { getAllAssistantFiles } from "./loadLocalAssistants.js";
-import ControlPlaneProfileLoader from "./profile/ControlPlaneProfileLoader.js";
 import LocalProfileLoader from "./profile/LocalProfileLoader.js";
 import PlatformProfileLoader from "./profile/PlatformProfileLoader.js";
 import {
@@ -135,16 +134,11 @@ export class ConfigHandler {
     const userId = await this.controlPlaneClient.userId;
     if (userId) {
       const orgDescs = await this.controlPlaneClient.listOrganizations();
-      if (await useHub(this.ideSettingsPromise)) {
-        const personalHubOrg = await this.getPersonalHubOrg();
-        const hubOrgs = await Promise.all(
-          orgDescs.map((org) => this.getNonPersonalHubOrg(org)),
-        );
-        return [...hubOrgs, personalHubOrg];
-      } else {
-        // Should only ever be one teams org. Will be removed soon anyways
-        return await Promise.all(orgDescs.map((org) => this.getTeamsOrg(org)));
-      }
+      const personalHubOrg = await this.getPersonalHubOrg();
+      const hubOrgs = await Promise.all(
+        orgDescs.map((org) => this.getNonPersonalHubOrg(org)),
+      );
+      return [...hubOrgs, personalHubOrg];
     } else {
       return [await this.getLocalOrg()];
     }
@@ -213,25 +207,6 @@ export class ConfigHandler {
     return this.rectifyProfilesForOrg(this.PERSONAL_ORG_DESC, allLocalProfiles);
   }
 
-  async getTeamsOrg(org: OrganizationDescription): Promise<OrgWithProfiles> {
-    const workspaces = await this.controlPlaneClient.listWorkspaces();
-    const profiles = await this.getAllLocalProfiles();
-    workspaces.forEach((workspace) => {
-      const profileLoader = new ControlPlaneProfileLoader(
-        workspace.id,
-        workspace.name,
-        this.controlPlaneClient,
-        this.ide,
-        this.ideSettingsPromise,
-        this.llmLogger,
-        this.reloadConfig.bind(this),
-      );
-
-      profiles.push(new ProfileLifecycleManager(profileLoader, this.ide));
-    });
-    return this.rectifyProfilesForOrg(org, profiles);
-  }
-
   private async rectifyProfilesForOrg(
     org: OrganizationDescription,
     profiles: ProfileLifecycleManager[],

core/config/profile/ControlPlaneProfileLoader.ts

@@ -112,7 +112,6 @@ async function loadConfigYaml(
         await controlPlaneClient.getAccessToken(),
         getControlPlaneEnvSync(
           ideSettings.continueTestEnvironment,
-          ideSettings.enableControlServerBeta,
         ).CONTROL_PLANE_URL,
       ),
       {

core/config/yaml/loadYaml.ts

@@ -21,16 +21,6 @@ const WORKOS_CLIENT_ID_STAGING = "client_01J0FW6XCPMJMQ3CG51RB4HBZQ";
 const WORKOS_ENV_ID_PRODUCTION = "continue";
 const WORKOS_ENV_ID_STAGING = "continue-staging";
 
-export const PRODUCTION_ENV: ControlPlaneEnv = {
-  DEFAULT_CONTROL_PLANE_PROXY_URL:
-    "https://control-plane-api-service-i3dqylpbqa-uc.a.run.app/",
-  CONTROL_PLANE_URL:
-    "https://control-plane-api-service-i3dqylpbqa-uc.a.run.app/",
-  AUTH_TYPE: WORKOS_ENV_ID_PRODUCTION,
-  WORKOS_CLIENT_ID: WORKOS_CLIENT_ID_PRODUCTION,
-  APP_URL: "https://app.continue.dev/",
-};
-
 const PRODUCTION_HUB_ENV: ControlPlaneEnv = {
   DEFAULT_CONTROL_PLANE_PROXY_URL: "https://api.continue.dev/",
   CONTROL_PLANE_URL: "https://api.continue.dev/",
@@ -71,15 +61,11 @@ export async function getControlPlaneEnv(
   ideSettingsPromise: Promise<IdeSettings>,
 ): Promise<ControlPlaneEnv> {
   const ideSettings = await ideSettingsPromise;
-  return getControlPlaneEnvSync(
-    ideSettings.continueTestEnvironment,
-    ideSettings.enableControlServerBeta,
-  );
+  return getControlPlaneEnvSync(ideSettings.continueTestEnvironment);
 }
 
 export function getControlPlaneEnvSync(
   ideTestEnvironment: IdeSettings["continueTestEnvironment"],
-  enableControlServerBeta: IdeSettings["enableControlServerBeta"],
 ): ControlPlaneEnv {
   // Note .local overrides .staging
   if (fs.existsSync(getLocalEnvironmentDotFilePath())) {
@@ -90,10 +76,6 @@ export function getControlPlaneEnvSync(
     return STAGING_ENV;
   }
 
-  if (enableControlServerBeta === true) {
-    return PRODUCTION_ENV;
-  }
-
   const env =
     ideTestEnvironment === "production"
       ? "hub"
@@ -109,17 +91,12 @@ export function getControlPlaneEnvSync(
       ? STAGING_ENV
       : env === "test"
         ? TEST_ENV
-        : env === "hub"
-          ? PRODUCTION_HUB_ENV
-          : PRODUCTION_ENV;
+        : PRODUCTION_HUB_ENV;
 }
 
 export async function useHub(
   ideSettingsPromise: Promise<IdeSettings>,
 ): Promise<boolean> {
   const ideSettings = await ideSettingsPromise;
-  if (ideSettings.enableControlServerBeta) {
-    return false;
-  }
   return ideSettings.continueTestEnvironment !== "none";
 }

core/control-plane/env.ts

@@ -172,8 +172,6 @@ export class Core {
           this.configHandler.currentProfile?.profileDescription.id || null,
         organizations: this.configHandler.getSerializedOrgs(),
         selectedOrgId: this.configHandler.currentOrg.id,
-        usingContinueForTeams: (await ideSettingsPromise)
-          .enableControlServerBeta,
       });
 
       // update additional submenu context providers registered via VSCode API
@@ -429,8 +427,6 @@ export class Core {
           this.configHandler.currentProfile?.profileDescription.id ?? null,
         organizations: this.configHandler.getSerializedOrgs(),
         selectedOrgId: this.configHandler.currentOrg.id,
-        usingContinueForTeams: (await ideSettingsPromise)
-          .enableControlServerBeta,
       };
     });
 

core/core.ts

@@ -699,7 +699,6 @@ export interface IdeSettings {
   remoteConfigServerUrl: string | undefined;
   remoteConfigSyncPeriod: number;
   userToken: string;
-  enableControlServerBeta: boolean;
   continueTestEnvironment: "none" | "production" | "staging" | "local";
   pauseCodebaseIndexOnStart: boolean;
 }

core/index.d.ts

@@ -69,7 +69,6 @@ export type ToCoreFromIdeOrWebviewProtocol = {
       profileId: string | null;
       organizations: SerializedOrgWithProfiles[];
       selectedOrgId: string;
-      usingContinueForTeams: boolean;
     },
   ];
   "config/deleteModel": [{ title: string }, void];

core/protocol/core.ts

@@ -15,7 +15,6 @@ export type ToWebviewFromIdeOrCoreProtocol = {
       profileId: string | null;
       organizations: SerializedOrgWithProfiles[];
       selectedOrgId: string | null;
-      usingContinueForTeams: boolean;
     },
     void,
   ];

core/protocol/webview.ts

@@ -52,7 +52,6 @@ class FileSystemIde implements IDE {
       remoteConfigServerUrl: undefined,
       remoteConfigSyncPeriod: 60,
       userToken: "",
-      enableControlServerBeta: false,
       continueTestEnvironment: "none",
       pauseCodebaseIndexOnStart: false,
     };

core/util/filesystem.ts

@@ -3,7 +3,7 @@ pluginGroup=com.github.continuedev.continueintellijextension
 pluginName=continue-intellij-extension
 pluginRepositoryUrl=https://github.com/continuedev/continue
 # SemVer format -> https://semver.org
-pluginVersion=1.0.12
+pluginVersion=1.0.13
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=223
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension

extensions/intellij/gradle.properties

@@ -2,7 +2,7 @@
   "name": "continue",
   "icon": "media/icon.png",
   "author": "Continue Dev, Inc",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "repository": {
     "type": "git",
     "url": "https://github.com/continuedev/continue"
@@ -92,11 +92,6 @@
           "default": true,
           "markdownDescription": "Continue collects anonymous usage data, cleaned of PII, to help us improve the product for our users. Read more  at [continue.dev › Telemetry](https://docs.continue.dev/telemetry)."
         },
-        "continue.enableContinueForTeams": {
-          "type": "boolean",
-          "default": false,
-          "markdownDescription": "Enable Continue for teams beta features. To sign in, click the gear icon to go to the settings page, and click Sign In."
-        },
         "continue.showInlineTip": {
           "type": "boolean",
           "default": true,

extensions/vscode/package-lock.json

@@ -759,10 +759,6 @@ class VsCodeIde implements IDE {
         60,
       ),
       userToken: settings.get<string>("userToken", ""),
-      enableControlServerBeta: settings.get<boolean>(
-        "enableContinueForTeams",
-        false,
-      ),
       continueTestEnvironment: "production",
       pauseCodebaseIndexOnStart: settings.get<boolean>(
         "pauseCodebaseIndexOnStart",

extensions/vscode/package.json

@@ -1,7 +1,7 @@
 import crypto from "crypto";
 
 import { ControlPlaneSessionInfo } from "core/control-plane/client";
-import { EXTENSION_NAME, getControlPlaneEnvSync } from "core/control-plane/env";
+import { getControlPlaneEnvSync } from "core/control-plane/env";
 import fetch from "node-fetch";
 import { v4 as uuidv4 } from "uuid";
 import {
@@ -16,7 +16,6 @@ import {
   ProgressLocation,
   Uri,
   window,
-  workspace,
 } from "vscode";
 
 import { PromiseAdapter, promiseFromEvent } from "./promiseUtils";
@@ -25,13 +24,7 @@ import { UriEventHandler } from "./uriHandler";
 
 const AUTH_NAME = "Continue";
 
-const enableControlServerBeta = workspace
-  .getConfiguration(EXTENSION_NAME)
-  .get<boolean>("enableContinueForTeams", false);
-const controlPlaneEnv = getControlPlaneEnvSync(
-  true ? "production" : "none",
-  enableControlServerBeta,
-);
+const controlPlaneEnv = getControlPlaneEnvSync(true ? "production" : "none");
 
 const SESSIONS_SECRET_KEY = `${controlPlaneEnv.AUTH_TYPE}.sessions`;