updates to secret rendering

Author: sestinj

core/config/ConfigHandler.ts

@@ -1,11 +1,6 @@
 import * as fs from "node:fs";
 
-import {
-  AssistantUnrolled,
-  ConfigResult,
-  FullSlug,
-} from "@continuedev/config-yaml";
-import * as YAML from "yaml";
+import { ConfigResult, FullSlug } from "@continuedev/config-yaml";
 
 import {
   ControlPlaneClient,
@@ -36,7 +31,6 @@ import {
   ProfileDescription,
   ProfileLifecycleManager,
 } from "./ProfileLifecycleManager.js";
-import { clientRenderHelper } from "./yaml/clientRender.js";
 
 export type { ProfileDescription };
 
@@ -172,38 +166,26 @@ export class ConfigHandler {
       // Logged in
       const assistants =
         await this.controlPlaneClient.listAssistants(selectedOrgId);
-      const hubProfiles = await Promise.all(
-        assistants.map(async (assistant) => {
-          let renderedConfig: AssistantUnrolled | undefined = undefined;
-          if (assistant.configResult.config) {
-            renderedConfig = await clientRenderHelper(
-              {
-                ownerSlug: assistant.ownerSlug,
-                packageSlug: assistant.packageSlug,
-              },
-              YAML.stringify(assistant.configResult.config),
-              selectedOrgId,
-              this.ide,
-              this.controlPlaneClient,
-            );
-          }
-
-          const profileLoader = new PlatformProfileLoader(
-            { ...assistant.configResult, config: renderedConfig },
-            assistant.ownerSlug,
-            assistant.packageSlug,
-            assistant.iconUrl,
-            assistant.configResult.config?.version ?? "latest",
-            this.controlPlaneClient,
-            this.ide,
-            this.ideSettingsPromise,
-            this.writeLog,
-            this.reloadConfig.bind(this),
-          );
 
-          return new ProfileLifecycleManager(profileLoader, this.ide);
-        }),
-      );
+      const hubProfiles = assistants.map((assistant) => {
+        const profileLoader = new PlatformProfileLoader(
+          {
+            ...assistant.configResult,
+            config: assistant.configResult.config,
+          },
+          assistant.ownerSlug,
+          assistant.packageSlug,
+          assistant.iconUrl,
+          assistant.configResult.config?.version ?? "latest",
+          this.controlPlaneClient,
+          this.ide,
+          this.ideSettingsPromise,
+          this.writeLog,
+          this.reloadConfig.bind(this),
+        );
+
+        return new ProfileLifecycleManager(profileLoader, this.ide);
+      });
 
       if (selectedOrgId === null) {
         // Personal

core/config/yaml/clientRender.ts

@@ -40,15 +40,18 @@ export class ControlPlaneClient {
     private readonly ideSettingsPromise: Promise<IdeSettings>,
   ) {}
 
-  async resolveFQSNs(fqsns: FQSN[]): Promise<(SecretResult | undefined)[]> {
+  async resolveFQSNs(
+    fqsns: FQSN[],
+    orgScopeId: string | null,
+  ): Promise<(SecretResult | undefined)[]> {
     const userId = await this.userId;
     if (!userId) {
       throw new Error("No user id");
     }
 
     const resp = await this.request("ide/sync-secrets", {
       method: "POST",
-      body: JSON.stringify({ fqsns }),
+      body: JSON.stringify({ fqsns, orgScopeId }),
     });
     return (await resp.json()) as any;
   }
@@ -183,21 +186,4 @@ export class ControlPlaneClient {
     });
     return ((await resp.json()) as any).settings;
   }
-
-  async syncSecrets(secretNames: string[]): Promise<Record<string, string>> {
-    const userId = await this.userId;
-    if (!userId) {
-      throw new Error("No user id");
-    }
-
-    try {
-      const resp = await this.request("ide/sync-secrets", {
-        method: "POST",
-        body: JSON.stringify({ secretNames }),
-      });
-      return (await resp.json()) as any;
-    } catch (e) {
-      return {};
-    }
-  }
 }

core/control-plane/client.ts

@@ -46,7 +46,7 @@
     "@aws-sdk/client-sagemaker-runtime": "^3.621.0",
     "@aws-sdk/credential-providers": "^3.620.1",
     "@continuedev/config-types": "^1.0.13",
-    "@continuedev/config-yaml": "^1.0.42",
+    "@continuedev/config-yaml": "^1.0.47",
     "@continuedev/fetch": "^1.0.4",
     "@continuedev/llm-info": "^1.0.2",
     "@continuedev/openai-adapters": "^1.0.10",

core/package-lock.json

@@ -15,7 +15,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@continuedev/config-yaml": "^1.0.42",
+    "@continuedev/config-yaml": "^1.0.47",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
     "@reduxjs/toolkit": "^2.3.0",

core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuedev/config-yaml",
-  "version": "1.0.42",
+  "version": "1.0.47",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

extensions/vscode/package-lock.json

@@ -18,7 +18,7 @@ import {
   parseAssistantUnrolled,
 } from "./unroll.js";
 
-export async function clientRender(
+export async function renderSecrets(
   packageSlug: PackageSlug,
   unrolledConfigContent: string,
   clientSecretStore: SecretStore,
@@ -109,7 +109,7 @@ function getContinueProxyModelName(
   return `${packageSlug.ownerSlug}/${packageSlug.packageSlug}/${provider}/${model}`;
 }
 
-function useProxyForUnrenderedSecrets(
+export function useProxyForUnrenderedSecrets(
   config: AssistantUnrolled,
   packageSlug: PackageSlug,
   orgScopeId: string | null,