@vellumai/assistant 0.8.1 → 0.8.3

package/src/config/seed-inference-profiles.ts

@@ -3,6 +3,8 @@ import {
   createConnection,
   disableManagedConnectionsForByokHatch,
   getConnection,
+  MANAGED_CONNECTION_NAMES,
+  PROVIDERS_REQUIRING_BASE_URL_AND_MODELS,
 } from "../providers/inference/connections.js";
 import { PROVIDER_CATALOG } from "../providers/model-catalog.js";
 import { resolveModelIntent } from "../providers/model-intents.js";
@@ -17,10 +19,6 @@ import {
 
 const log = getLogger("seed-inference-profiles");
 
-const MANAGED_CONNECTION_NAME = "anthropic-managed";
-const MANAGED_PROFILE_PROVIDER: NonNullable<ProfileEntry["provider"]> =
-  "anthropic";
-
 /**
  * Template for a daemon-managed inference profile. The profile's model is
  * resolved at seed time from `PROVIDER_MODEL_INTENTS` so the catalog stays the
@@ -31,16 +29,20 @@ type ManagedProfileTemplate = Omit<
   "provider" | "model" | "provider_connection"
 > & {
   intent: ModelIntent;
+  provider: NonNullable<ProfileEntry["provider"]>;
+  connectionName: string;
 };
 
 /**
- * Managed Anthropic profiles. Overwritten on every daemon boot so Vellum can
- * push model/config updates to customers in new releases. Platform overlays
+ * Managed profiles. Overwritten on every daemon boot so Vellum can push
+ * model/config updates to customers in new releases. Platform overlays
  * (`preserveProfileNames`) take precedence when present.
  */
 const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   balanced: {
     intent: "balanced",
+    provider: "anthropic",
+    connectionName: "anthropic-managed",
     source: "managed",
     label: "Balanced",
     description: "Good balance of quality, cost, and speed",
@@ -51,6 +53,8 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   },
   "quality-optimized": {
     intent: "quality-optimized",
+    provider: "anthropic",
+    connectionName: "anthropic-managed",
     source: "managed",
     label: "Quality",
     description: "Best results with the most capable model",
@@ -61,6 +65,8 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   },
   "cost-optimized": {
     intent: "latency-optimized",
+    provider: "anthropic",
+    connectionName: "anthropic-managed",
     source: "managed",
     label: "Speed",
     description: "Fastest responses at lower cost",
@@ -74,11 +80,15 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
 /**
  * User profile templates. Materialized at hatch time for off-platform
  * installations. Each points at the user's personal provider connection
- * (backed by their API key in CES).
+ * (backed by their API key in CES). The `provider` and `connectionName`
+ * fields are placeholders — they are overridden at hatch time with the
+ * user's chosen provider and personal connection name.
  */
 const USER_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   "custom-balanced": {
     intent: "balanced",
+    provider: "anthropic",
+    connectionName: "",
     source: "user",
     label: "Balanced",
     description: "Good balance of quality, cost, and speed",
@@ -89,6 +99,8 @@ const USER_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   },
   "custom-quality-optimized": {
     intent: "quality-optimized",
+    provider: "anthropic",
+    connectionName: "",
     source: "user",
     label: "Quality",
     description: "Best results with the most capable model",
@@ -99,6 +111,8 @@ const USER_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   },
   "custom-cost-optimized": {
     intent: "latency-optimized",
+    provider: "anthropic",
+    connectionName: "",
     source: "user",
     label: "Speed",
     description: "Fastest responses at lower cost",
@@ -164,11 +178,12 @@ export function seedInferenceProfiles(
   // BYOK mode = off-platform installs. The user is bringing their own provider
   // API key; managed profile labels get a " (Managed)" suffix to disambiguate
   // from the personal "custom-*" profiles that share base labels. Managed
-  // profile + connection status is initially "disabled" so the picker doesn't
-  // offer an unusable platform-auth option on day one — but ONLY at hatch
-  // time, and ONLY when the entry isn't already in the user's config (i.e.
-  // first materialization). Post-hatch user toggles survive every subsequent
-  // boot.
+  // profile + connection status is initially "disabled" for true BYOK hatches
+  // so the picker doesn't offer an unusable platform-auth option on day one.
+  // When the hatch overlay explicitly selects a managed profile, the matching
+  // managed connection stays active so the first post-onboarding message can
+  // use the user's chosen managed route. Post-hatch user toggles survive every
+  // subsequent boot.
   const isByokMode = !isPlatform;
 
   // 1. Managed profiles. Off-platform: overwrite on every boot so Vellum can
@@ -198,10 +213,18 @@ export function seedInferenceProfiles(
   //        rewritten to the suffixed form. Any other previous label value
   //        (user-set custom string, explicit null, already-suffixed) is
   //        preserved as-is.
-  //      • status: "disabled" on fresh materialization at hatch only —
-  //        gated on (isHatch && !previous) so post-hatch boots and existing
-  //        installs are never auto-disabled. A user re-enable persists
-  //        across boots via the key-presence preservation below.
+  //      • status: "disabled" on fresh materialization at BYOK hatch only —
+  //        gated on (isHatch && !previous) and skipped for any managed
+  //        connection explicitly selected by the hatch overlay. Post-hatch
+  //        boots and existing installs are never auto-disabled. A user
+  //        re-enable persists across boots via the key-presence preservation
+  //        below.
+  const hatchSelectedManagedConnection = getHatchSelectedManagedConnection(
+    llm,
+    profiles,
+    options,
+  );
+
   for (const [name, template] of Object.entries(MANAGED_PROFILE_TEMPLATES)) {
     if (preservedProfileNames.has(name)) continue;
     if (isPlatform && readObject(profiles[name]) !== null) continue;
@@ -212,10 +235,15 @@ export function seedInferenceProfiles(
       : template;
     const next = materializeProfile(
       effectiveTemplate,
-      MANAGED_PROFILE_PROVIDER,
-      MANAGED_CONNECTION_NAME,
+      template.provider,
+      template.connectionName,
     ) as Record<string, unknown>;
-    if (isByokMode && options.isHatch && !previous) {
+    if (
+      isByokMode &&
+      options.isHatch &&
+      !previous &&
+      template.connectionName !== hatchSelectedManagedConnection
+    ) {
       next.status = "disabled";
     }
     if (previous) {
@@ -238,17 +266,24 @@ export function seedInferenceProfiles(
   // 2. User profiles — only at hatch time for off-platform installations.
   let userConnectionName: string | undefined;
   if (options.isHatch && !isPlatform) {
-    // BYOK hatch: disable the three canonical managed connections so the
-    // picker doesn't surface unusable platform-auth options on day one.
-    // Runs only here, only at hatch — `seedCanonicalConnections` leaves
-    // `status` alone on subsequent boots so a post-hatch user re-enable
-    // persists.
+    // BYOK hatch: disable canonical managed connections so the picker doesn't
+    // surface unusable platform-auth options on day one. If the hatch overlay
+    // selected a managed profile, leave that connection active; the user has
+    // already chosen managed inference. Runs only here, only at hatch —
+    // `seedCanonicalConnections` leaves `status` alone on subsequent boots so
+    // a post-hatch user re-enable persists.
     if (options.db) {
-      disableManagedConnectionsForByokHatch(options.db);
+      disableManagedConnectionsForByokHatch(options.db, {
+        excludeConnection: hatchSelectedManagedConnection,
+      });
     }
 
     const hatchProvider = readString(readObject(llm.default)?.provider);
-    if (hatchProvider && hatchProvider !== "ollama") {
+    if (
+      hatchProvider &&
+      hatchProvider !== "ollama" &&
+      !PROVIDERS_REQUIRING_BASE_URL_AND_MODELS.has(hatchProvider)
+    ) {
       userConnectionName = `${hatchProvider}-personal`;
 
       if (options.db) {
@@ -269,8 +304,7 @@ export function seedInferenceProfiles(
         }
       }
 
-      const provider =
-        hatchProvider as NonNullable<ProfileEntry["provider"]>;
+      const provider = hatchProvider as NonNullable<ProfileEntry["provider"]>;
       for (const [name, template] of Object.entries(USER_PROFILE_TEMPLATES)) {
         if (preservedProfileNames.has(name)) continue;
         profiles[name] = materializeProfile(
@@ -342,7 +376,7 @@ function materializeProfile(
   provider: NonNullable<ProfileEntry["provider"]>,
   connectionName: string,
 ): ProfileEntry {
-  const { intent, ...rest } = template;
+  const { intent, provider: _p, connectionName: _c, ...rest } = template;
   return {
     ...rest,
     provider,
@@ -361,6 +395,42 @@ function readString(value: unknown): string | undefined {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 
+function getHatchSelectedManagedConnection(
+  llm: Record<string, unknown>,
+  profiles: Record<string, Record<string, unknown>>,
+  options: SeedInferenceProfilesOptions,
+): string | undefined {
+  if (!options.isHatch || options.preserveActiveProfile !== true) {
+    return undefined;
+  }
+
+  const activeProfile = readString(llm.activeProfile);
+  if (!activeProfile) return undefined;
+
+  const activeProfileEntry = readObject(profiles[activeProfile]);
+  if (
+    activeProfileEntry &&
+    Object.prototype.hasOwnProperty.call(
+      activeProfileEntry,
+      "provider_connection",
+    )
+  ) {
+    const explicitConnection = readString(
+      activeProfileEntry.provider_connection,
+    );
+    return explicitConnection &&
+      MANAGED_CONNECTION_NAMES.has(explicitConnection)
+      ? explicitConnection
+      : undefined;
+  }
+
+  const templateConnection =
+    MANAGED_PROFILE_TEMPLATES[activeProfile]?.connectionName;
+  return templateConnection && MANAGED_CONNECTION_NAMES.has(templateConnection)
+    ? templateConnection
+    : undefined;
+}
+
 /**
  * Format the human-readable label seeded onto a personal provider connection
  * at hatch time, e.g. `"Anthropic (Personal)"`. The display name is sourced

package/src/config/skills.ts

@@ -203,10 +203,6 @@ export function getBundledSkillsDir(): string {
   return join(dir, "bundled-skills");
 }
 
-function getSkillsIndexPath(skillsDir: string): string {
-  return join(skillsDir, "SKILLS.md");
-}
-
 // ─── Frontmatter parsing ─────────────────────────────────────────────────────
 
 interface ParsedFrontmatter {
@@ -618,94 +614,6 @@ function loadBundledSkills(): SkillSummary[] {
   return skills;
 }
 
-// ─── Index parsing ───────────────────────────────────────────────────────────
-
-function parseIndexEntry(line: string): string | null {
-  const bulletMatch = line.trim().match(/^[-*]\s+(.+)$/);
-  if (!bulletMatch) return null;
-
-  let entry = bulletMatch[1].trim();
-  const markdownLinkMatch = entry.match(/^\[[^\]]+\]\(([^)]+)\)$/);
-  if (markdownLinkMatch) {
-    entry = markdownLinkMatch[1].trim();
-  }
-
-  if (entry.startsWith("`") && entry.endsWith("`")) {
-    entry = entry.slice(1, -1).trim();
-  }
-
-  return entry.length > 0 ? entry : null;
-}
-
-function resolveIndexEntryToDirectory(
-  skillsDir: string,
-  entry: string,
-): string | null {
-  if (isAbsolute(entry)) {
-    log.warn(
-      { entry },
-      "Skipping SKILLS.md entry because absolute paths are not allowed",
-    );
-    return null;
-  }
-
-  const resolvedEntryPath = resolve(skillsDir, entry);
-  const resolvedDirectory =
-    basename(resolvedEntryPath).toLowerCase() === "skill.md"
-      ? dirname(resolvedEntryPath)
-      : resolvedEntryPath;
-
-  const relativePath = getRelativeToSkillsRoot(skillsDir, resolvedDirectory);
-  if (relativePath.length === 0) {
-    log.warn(
-      { entry },
-      "Skipping SKILLS.md entry that resolves to the skills root",
-    );
-    return null;
-  }
-  if (isOutsideSkillsRoot(skillsDir, resolvedDirectory)) {
-    log.warn(
-      { entry, resolvedDirectory: getCanonicalPath(resolvedDirectory) },
-      "Skipping SKILLS.md entry that resolves outside ~/.vellum/workspace/skills",
-    );
-    return null;
-  }
-
-  return resolvedDirectory;
-}
-
-function getIndexedSkillDirectories(skillsDir: string): string[] | null {
-  const indexPath = getSkillsIndexPath(skillsDir);
-  if (!existsSync(indexPath)) return null;
-
-  let rawIndex = "";
-  try {
-    rawIndex = readFileSync(indexPath, "utf-8");
-  } catch (err) {
-    log.warn(
-      { err, indexPath },
-      "Failed to read SKILLS.md; treating as empty catalog",
-    );
-    return [];
-  }
-
-  const directories: string[] = [];
-  const seen = new Set<string>();
-
-  for (const line of rawIndex.split(/\r?\n/)) {
-    const parsedEntry = parseIndexEntry(line);
-    if (!parsedEntry) continue;
-
-    const directory = resolveIndexEntryToDirectory(skillsDir, parsedEntry);
-    if (!directory || seen.has(directory)) continue;
-
-    seen.add(directory);
-    directories.push(directory);
-  }
-
-  return directories;
-}
-
 function discoverSkillDirectories(skillsDir: string): string[] {
   if (!existsSync(skillsDir)) return [];
 
@@ -713,7 +621,7 @@ function discoverSkillDirectories(skillsDir: string): string[] {
   try {
     const entries = readdirSync(skillsDir, { withFileTypes: true });
     for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
+      if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
       const directoryPath = join(skillsDir, entry.name);
       if (existsSync(join(directoryPath, "SKILL.md"))) {
         dirs.push(directoryPath);
@@ -867,8 +775,7 @@ export function loadSkillCatalog(
 
   // Load managed (user) skills, which take precedence over bundled skills with the same ID
   const skillsDir = getSkillsDir();
-  const indexedDirectories = getIndexedSkillDirectories(skillsDir);
-  const directories = indexedDirectories ?? discoverSkillDirectories(skillsDir);
+  const directories = discoverSkillDirectories(skillsDir);
 
   for (const directory of directories) {
     const skill = readSkillFromDirectory(directory, skillsDir, "managed");
@@ -1164,7 +1071,7 @@ export function resolveSkillSelector(
   const catalog = loadSkillCatalog(workspaceSkillsDir);
   if (catalog.length === 0) {
     return {
-      error: `No skills are available. Configure ${getWorkspaceDirDisplay()}/skills/SKILLS.md or add skill directories.`,
+      error: `No skills are available. Add skill directories under ${getWorkspaceDirDisplay()}/skills/.`,
       errorCode: "empty_catalog",
     };
   }