rename AssistantRolled back to ConfigYaml

Author: sestinj

core/package-lock.json

@@ -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.17",
+    "@continuedev/config-yaml": "^1.0.18",
     "@continuedev/fetch": "^1.0.4",
     "@continuedev/llm-info": "^1.0.2",
     "@continuedev/openai-adapters": "^1.0.10",

core/package.json

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

gui/package-lock.json

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

gui/package.json

@@ -1,10 +1,10 @@
 import { ConfigJson } from "@continuedev/config-types";
-import { AssistantRolled } from "./schemas/index.js";
+import { ConfigYaml } from "./schemas/index.js";
 import { ModelRoles } from "./schemas/models.js";
 
-type ModelYaml = NonNullable<AssistantRolled["models"]>[number];
-type ContextYaml = NonNullable<AssistantRolled["context"]>[number];
-type PromptYaml = NonNullable<AssistantRolled["prompts"]>[number];
+type ModelYaml = NonNullable<ConfigYaml["models"]>[number];
+type ContextYaml = NonNullable<ConfigYaml["context"]>[number];
+type PromptYaml = NonNullable<ConfigYaml["prompts"]>[number];
 
 function convertModel(
   m: ConfigJson["models"][number],
@@ -68,9 +68,7 @@ function convertCustomCommand(
   };
 }
 
-function convertMcp(
-  mcp: any,
-): NonNullable<AssistantRolled["mcpServers"]>[number] {
+function convertMcp(mcp: any): NonNullable<ConfigYaml["mcpServers"]>[number] {
   const { transport } = mcp;
   const { command, args, env } = transport;
 
@@ -84,7 +82,7 @@ function convertMcp(
 
 function convertDoc(
   doc: NonNullable<ConfigJson["docs"]>[number],
-): NonNullable<AssistantRolled["docs"]>[number] {
+): NonNullable<ConfigYaml["docs"]>[number] {
   return {
     name: doc.title,
     startUrl: doc.startUrl,
@@ -93,9 +91,7 @@ function convertDoc(
   };
 }
 
-export function convertJsonToYamlConfig(
-  configJson: ConfigJson,
-): AssistantRolled {
+export function convertJsonToYamlConfig(configJson: ConfigJson): ConfigYaml {
   // models
   const models = configJson.models.map((m) => convertModel(m, ["chat"]));
   const autocompleteModels = Array.isArray(configJson.tabAutocompleteModel)
@@ -130,7 +126,7 @@ export function convertJsonToYamlConfig(
   // docs
   const docs = configJson.docs?.map(convertDoc);
 
-  const configYaml: AssistantRolled = {
+  const configYaml: ConfigYaml = {
     name: "Continue Config",
     version: "0.0.1",
     models,

packages/config-yaml/package.json

@@ -1,9 +1,9 @@
-import { AssistantRolled } from "../schemas/index.js";
+import { ConfigYaml } from "../schemas/index.js";
 
 export function mergePackages(
-  current: AssistantRolled,
-  incoming: AssistantRolled,
-): AssistantRolled {
+  current: ConfigYaml,
+  incoming: ConfigYaml,
+): ConfigYaml {
   return {
     ...current,
     models: [...(current.models ?? []), ...(incoming.models ?? [])],

packages/config-yaml/src/converter.ts

@@ -7,18 +7,18 @@ import {
   PackageSlug,
 } from "../interfaces/slugs.js";
 import {
-  AssistantRolled,
-  assistantRolledSchema,
   AssistantUnrolled,
   assistantUnrolledSchema,
   Block,
   blockSchema,
+  ConfigYaml,
+  configYamlSchema,
 } from "../schemas/index.js";
 
-export function parseAssistantRolled(configYaml: string): AssistantRolled {
+export function parseConfigYaml(configYaml: string): ConfigYaml {
   try {
     const parsed = YAML.parse(configYaml);
-    const result = assistantRolledSchema.parse(parsed);
+    const result = configYamlSchema.parse(parsed);
     return result;
   } catch (e: any) {
     console.log(configYaml);
@@ -123,9 +123,6 @@ function extractFQSNMap(
   return secretToFQSNMap(secrets, parentPackages);
 }
 
-/**
- * Loading an assistant is equivalent to loading a package without params
- */
 export async function unrollAssistant(
   fullSlug: string,
   registry: Registry,
@@ -134,25 +131,32 @@ export async function unrollAssistant(
 
   // Request the content from the registry
   const rawContent = await registry.getContent(assistantSlug);
+  return unrollAssistantFromContent(assistantSlug, rawContent, registry);
+}
 
+export async function unrollAssistantFromContent(
+  assistantSlug: FullSlug,
+  rawYaml: string,
+  registry: Registry,
+): Promise<AssistantUnrolled> {
   // Convert the raw YAML to unrolled config
   const templateData: TemplateData = {
     // no inputs to an assistant
     inputs: {},
     // at this stage, secrets are mapped to a (still templated) FQSN
-    secrets: extractFQSNMap(rawContent, [assistantSlug]),
+    secrets: extractFQSNMap(rawYaml, [assistantSlug]),
     // Built-in variables
     continue: {},
   };
 
   // Render the template
   const templatedYaml = fillTemplateVariables(
-    rawContent,
+    rawYaml,
     flattenTemplateData(templateData),
   );
 
   // Parse string to Zod-validated YAML
-  let parsedYaml = parseAssistantRolled(templatedYaml);
+  let parsedYaml = parseConfigYaml(templatedYaml);
 
   // Unroll blocks
   const unrolledAssistant = await unrollBlocks(
@@ -165,7 +169,7 @@ export async function unrollAssistant(
 }
 
 export async function unrollBlocks(
-  assistant: AssistantRolled,
+  assistant: ConfigYaml,
   assistantFullSlug: FullSlug,
   registry: Registry,
 ): Promise<AssistantUnrolled> {
@@ -174,10 +178,7 @@ export async function unrollBlocks(
     version: assistant.version,
   };
 
-  const sections: (keyof Omit<
-    AssistantRolled,
-    "name" | "version" | "rules"
-  >)[] = [
+  const sections: (keyof Omit<ConfigYaml, "name" | "version" | "rules">)[] = [
     "models",
     "context",
     "data",

packages/config-yaml/src/load/merge.ts

@@ -48,7 +48,7 @@ export const blockItemWrapperSchema = <T extends z.AnyZodObject>(schema: T) =>
 export const blockOrSchema = <T extends z.AnyZodObject>(schema: T) =>
   z.union([schema, blockItemWrapperSchema(schema)]);
 
-export const assistantRolledSchema = z.object({
+export const configYamlSchema = z.object({
   name: z.string(),
   version: z.string(),
   models: z
@@ -82,7 +82,7 @@ export const assistantRolledSchema = z.object({
   docs: z.array(blockOrSchema(docSchema)).optional(),
 });
 
-export type AssistantRolled = z.infer<typeof assistantRolledSchema>;
+export type ConfigYaml = z.infer<typeof configYamlSchema>;
 
 export const assistantUnrolledSchema = z.object({
   name: z.string(),

packages/config-yaml/src/load/unroll.ts

@@ -1,4 +1,4 @@
-import { AssistantRolled, assistantRolledSchema } from "./schemas/index.js";
+import { ConfigYaml, configYamlSchema } from "./schemas/index.js";
 
 export interface ConfigValidationError {
   fatal: boolean;
@@ -12,12 +12,12 @@ export interface ConfigResult<T> {
 }
 
 export function validateConfigYaml(
-  config: AssistantRolled,
+  config: ConfigYaml,
 ): ConfigValidationError[] {
   const errors: ConfigValidationError[] = [];
 
   try {
-    assistantRolledSchema.parse(config);
+    configYamlSchema.parse(config);
   } catch (e: any) {
     return [
       {