continuedev
diff --git a/‎binary/package-lock.json
+1 b/‎binary/package-lock.json
+1
diff --git a/‎core/autocomplete/completionProvider.ts
+1 b/‎core/autocomplete/completionProvider.ts
+1
diff --git a/‎core/autocomplete/languages.ts
+24 b/‎core/autocomplete/languages.ts
+24
diff --git a/‎core/config/ConfigHandler.ts
+50-32 b/‎core/config/ConfigHandler.ts
+50-32
diff --git a/‎core/context/index.ts
+1 b/‎core/context/index.ts
+1
@@ -581,6 +581,7 @@ export class CompletionProvider {
         suffix,
         filename,
         reponame,
+        language: lang.name,
       });
     } else {
       // Let the template function format snippets
 
@@ -1,6 +1,7 @@
 import type { LineFilter } from "./lineStream";
 
 export interface AutocompleteLanguageInfo {
+  name: string;
   topLevelKeywords: string[];
   singleLineComment: string;
   endOfLine: string[];
@@ -14,13 +15,15 @@ export interface AutocompleteLanguageInfo {
 
 // TypeScript
 export const Typescript = {
+  name: "TypeScript",
   topLevelKeywords: ["function", "class", "module", "export", "import"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Python
 export const Python = {
+  name: "Python",
   // """"#" is for .ipynb files, where we add '"""' surrounding markdown blocks.
   // This stops the model from trying to complete the start of a new markdown block
   topLevelKeywords: ["def", "class", '"""#'],
@@ -30,55 +33,63 @@ export const Python = {
 
 // Java
 export const Java = {
+  name: "Java",
   topLevelKeywords: ["class", "function"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // C++
 export const Cpp = {
+  name: "C++",
   topLevelKeywords: ["class", "namespace", "template"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // C#
 export const CSharp = {
+  name: "C#",
   topLevelKeywords: ["class", "namespace", "void"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // C
 export const C = {
+  name: "C",
   topLevelKeywords: ["if", "else", "while", "for", "switch", "case"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Scala
 export const Scala = {
+  name: "Scala",
   topLevelKeywords: ["def", "val", "var", "class", "object", "trait"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Go
 export const Go = {
+  name: "Go",
   topLevelKeywords: ["func", "package", "import", "type"],
   singleLineComment: "//",
   endOfLine: [],
 };
 
 // Rust
 export const Rust = {
+  name: "Rust",
   topLevelKeywords: ["fn", "mod", "pub", "struct", "enum", "trait"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Haskell
 export const Haskell = {
+  name: "Haskell",
   topLevelKeywords: [
     "data",
     "type",
@@ -95,48 +106,55 @@ export const Haskell = {
 
 // PHP
 export const PHP = {
+  name: "PHP",
   topLevelKeywords: ["function", "class", "namespace", "use"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Ruby on Rails
 export const RubyOnRails = {
+  name: "Ruby on Rails",
   topLevelKeywords: ["def", "class", "module"],
   singleLineComment: "#",
   endOfLine: [],
 };
 
 // Swift
 export const Swift = {
+  name: "Swift",
   topLevelKeywords: ["func", "class", "struct", "import"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Kotlin
 export const Kotlin = {
+  name: "Kotlin",
   topLevelKeywords: ["fun", "class", "package", "import"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Ruby
 export const Ruby = {
+  name: "Ruby",
   topLevelKeywords: ["class", "module", "def"],
   singleLineComment: "#",
   endOfLine: [],
 };
 
 // Clojure
 export const Clojure = {
+  name: "Clojure",
   topLevelKeywords: ["def", "fn", "let", "do", "if", "defn", "ns", "defmacro"],
   singleLineComment: ";",
   endOfLine: [],
 };
 
 // Julia
 export const Julia = {
+  name: "Julia",
   topLevelKeywords: [
     "function",
     "macro",
@@ -155,6 +173,7 @@ export const Julia = {
 
 // F#
 export const FSharp = {
+  name: "F#",
   topLevelKeywords: [
     "let",
     "type",
@@ -173,6 +192,7 @@ export const FSharp = {
 
 // R
 export const R = {
+  name: "R",
   topLevelKeywords: [
     "function",
     "if",
@@ -189,13 +209,15 @@ export const R = {
 
 // Dart
 export const Dart = {
+  name: "Dart",
   topLevelKeywords: ["class", "import", "void", "enum"],
   singleLineComment: "//",
   endOfLine: [";"],
 };
 
 // Solidity
 export const Solidity = {
+  name: "Solidity",
   topLevelKeywords: [
     "contract",
     "event",
@@ -218,6 +240,7 @@ export const Solidity = {
 
 // YAML
 export const YAML: AutocompleteLanguageInfo = {
+  name: "YAML",
   topLevelKeywords: [],
   singleLineComment: "#",
   endOfLine: [],
@@ -258,6 +281,7 @@ export const YAML: AutocompleteLanguageInfo = {
 };
 
 export const Markdown: AutocompleteLanguageInfo = {
+  name: "Markdown",
   topLevelKeywords: [],
   singleLineComment: "",
   endOfLine: [],
 
@@ -1,4 +1,7 @@
-import { ControlPlaneClient } from "../control-plane/client.js";
+import {
+  ControlPlaneClient,
+  ControlPlaneSessionInfo,
+} from "../control-plane/client.js";
 import {
   BrowserSerializedContinueConfig,
   ContinueConfig,
@@ -118,44 +121,20 @@ export class ConfigHandler {
     return this.profiles.filter((p) => p.profileId !== this.selectedProfileId);
   }
 
-  constructor(
-    private readonly ide: IDE,
-    private ideSettingsPromise: Promise<IdeSettings>,
-    private readonly writeLog: (text: string) => Promise<void>,
-    private readonly controlPlaneClient: ControlPlaneClient,
-  ) {
-    this.ide = ide;
-    this.ideSettingsPromise = ideSettingsPromise;
-    this.writeLog = writeLog;
-
-    // Set local profile as default
-    const localProfileLoader = new LocalProfileLoader(
-      ide,
-      ideSettingsPromise,
-      writeLog,
-    );
-    this.profiles = [new ProfileLifecycleManager(localProfileLoader)];
-    this.selectedProfileId = localProfileLoader.profileId;
-
-    // Always load local profile immediately in case control plane doesn't load
-    try {
-      this.loadConfig();
-    } catch (e) {
-      console.error("Failed to load config: ", e);
-    }
-
-    // Load control plane profiles
-    // TODO
+  private async fetchControlPlaneProfiles() {
     // Get the profiles and create their lifecycle managers
     this.controlPlaneClient.listWorkspaces().then(async (workspaces) => {
+      this.profiles = this.profiles.filter(
+        (profile) => profile.profileId === "local",
+      );
       workspaces.forEach((workspace) => {
         const profileLoader = new ControlPlaneProfileLoader(
           workspace.id,
           workspace.name,
           this.controlPlaneClient,
-          ide,
-          ideSettingsPromise,
-          writeLog,
+          this.ide,
+          this.ideSettingsPromise,
+          this.writeLog,
           this.reloadConfig.bind(this),
         );
         this.profiles.push(new ProfileLifecycleManager(profileLoader));
@@ -184,6 +163,36 @@ export class ConfigHandler {
     });
   }
 
+  constructor(
+    private readonly ide: IDE,
+    private ideSettingsPromise: Promise<IdeSettings>,
+    private readonly writeLog: (text: string) => Promise<void>,
+    private controlPlaneClient: ControlPlaneClient,
+  ) {
+    this.ide = ide;
+    this.ideSettingsPromise = ideSettingsPromise;
+    this.writeLog = writeLog;
+
+    // Set local profile as default
+    const localProfileLoader = new LocalProfileLoader(
+      ide,
+      ideSettingsPromise,
+      writeLog,
+    );
+    this.profiles = [new ProfileLifecycleManager(localProfileLoader)];
+    this.selectedProfileId = localProfileLoader.profileId;
+
+    // Always load local profile immediately in case control plane doesn't load
+    try {
+      this.loadConfig();
+    } catch (e) {
+      console.error("Failed to load config: ", e);
+    }
+
+    // Load control plane profiles
+    this.fetchControlPlaneProfiles();
+  }
+
   async setSelectedProfile(profileId: string) {
     this.selectedProfileId = profileId;
     const newConfig = await this.loadConfig();
@@ -209,6 +218,15 @@ export class ConfigHandler {
     this.reloadConfig();
   }
 
+  updateControlPlaneSessionInfo(
+    sessionInfo: ControlPlaneSessionInfo | undefined,
+  ) {
+    this.controlPlaneClient = new ControlPlaneClient(
+      Promise.resolve(sessionInfo),
+    );
+    this.fetchControlPlaneProfiles();
+  }
+
   private profilesListeners: ((profiles: ProfileDescription[]) => void)[] = [];
   onDidChangeAvailableProfiles(
     listener: (profiles: ProfileDescription[]) => void,
 
@@ -6,6 +6,7 @@ import type {
   IContextProvider,
   LoadSubmenuItemsArgs,
 } from "../index.js";
+
 export abstract class BaseContextProvider implements IContextProvider {
   options: { [key: string]: any };