@vellumai/assistant 0.8.0 → 0.8.2

package/src/skills/managed-store.ts

@@ -2,7 +2,6 @@ import { randomUUID } from "node:crypto";
 import {
   existsSync,
   mkdirSync,
-  readFileSync,
   renameSync,
   rmSync,
   writeFileSync,
@@ -43,10 +42,6 @@ function getManagedSkillDir(id: string): string {
   return join(getManagedSkillsDir(), id);
 }
 
-function getSkillsIndexPath(): string {
-  return join(getManagedSkillsDir(), "SKILLS.md");
-}
-
 // ─── SKILL.md generation ─────────────────────────────────────────────────────
 
 interface BuildSkillMarkdownInput {
@@ -106,91 +101,12 @@ function atomicWriteFile(filePath: string, content: string): void {
   renameSync(tmpPath, filePath);
 }
 
-// ─── SKILLS.md index management ──────────────────────────────────────────────
-
-function readIndexLines(): string[] {
-  const indexPath = getSkillsIndexPath();
-  if (!existsSync(indexPath)) return [];
-  return readFileSync(indexPath, "utf-8").split("\n");
-}
-
-function writeIndexLines(lines: string[]): void {
-  const content = lines.join("\n");
-  atomicWriteFile(
-    getSkillsIndexPath(),
-    content.endsWith("\n") ? content : content + "\n",
-  );
-}
-
-function indexEntryRegex(id: string): RegExp {
-  const escaped = id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  // Match both - and * bullets, optional backticks, optional markdown link wrapping,
-  // and optional /SKILL.md suffix (inside or outside link parens)
-  return new RegExp(
-    `^[-*]\\s+(?:\`)?(?:\\[.*?\\]\\()?${escaped}(?:/SKILL\\.md)?(?:\\))?(?:\`)?\\s*$`,
-  );
-}
-
-export function upsertSkillsIndexEntry(id: string): void {
-  const lines = readIndexLines();
-  const pattern = indexEntryRegex(id);
-  if (lines.some((line) => pattern.test(line))) {
-    return; // already present
-  }
-  // Append new entry
-  const nonEmpty = lines.filter((l) => l.trim());
-  nonEmpty.push(`- ${id}`);
-  writeIndexLines(nonEmpty);
-  log.info({ id }, "Added managed skill to SKILLS.md index");
-}
-
-export function removeSkillsIndexEntry(id: string): void {
-  const lines = readIndexLines();
-  const pattern = indexEntryRegex(id);
-  const filtered = lines.filter((line) => !pattern.test(line));
-  if (filtered.length === lines.length) {
-    return; // not found
-  }
-  writeIndexLines(filtered.filter((l) => l.trim()));
-  log.info({ id }, "Removed managed skill from SKILLS.md index");
-}
-
 // ─── Version metadata ─────────────────────────────────────────────────────────
 
-interface SkillVersionMeta {
-  version: string;
-  installedAt: string;
-}
-
 function getVersionMetaPath(id: string): string {
   return join(getManagedSkillDir(id), "version.json");
 }
 
-export function readSkillVersion(id: string): string | null {
-  // Try install-meta.json first (new format)
-  const installMetaPath = join(getManagedSkillDir(id), "install-meta.json");
-  if (existsSync(installMetaPath)) {
-    try {
-      const raw = readFileSync(installMetaPath, "utf-8");
-      const meta = JSON.parse(raw) as { version?: string };
-      if (meta.version) return meta.version;
-    } catch {
-      // Fall through to legacy path
-    }
-  }
-
-  // Fall back to legacy version.json
-  const metaPath = getVersionMetaPath(id);
-  if (!existsSync(metaPath)) return null;
-  try {
-    const raw = readFileSync(metaPath, "utf-8");
-    const meta: SkillVersionMeta = JSON.parse(raw);
-    return meta.version ?? null;
-  } catch {
-    return null;
-  }
-}
-
 // ─── Create / Delete ─────────────────────────────────────────────────────────
 
 interface CreateManagedSkillParams {
@@ -200,7 +116,6 @@ interface CreateManagedSkillParams {
   bodyMarkdown: string;
   emoji?: string;
   overwrite?: boolean;
-  addToIndex?: boolean;
   includes?: string[];
   version?: string;
   contactId?: string;
@@ -209,7 +124,6 @@ interface CreateManagedSkillParams {
 interface CreateManagedSkillResult {
   created: boolean;
   path: string;
-  indexUpdated: boolean;
   error?: string;
 }
 
@@ -221,7 +135,6 @@ export function createManagedSkill(
     return {
       created: false,
       path: "",
-      indexUpdated: false,
       error: validationError,
     };
   }
@@ -230,7 +143,6 @@ export function createManagedSkill(
     return {
       created: false,
       path: "",
-      indexUpdated: false,
       error: "name is required",
     };
   }
@@ -238,7 +150,6 @@ export function createManagedSkill(
     return {
       created: false,
       path: "",
-      indexUpdated: false,
       error: "description is required",
     };
   }
@@ -250,7 +161,6 @@ export function createManagedSkill(
     return {
       created: false,
       path: skillFilePath,
-      indexUpdated: false,
       error: `Managed skill "${params.id}" already exists. Set overwrite=true to replace it.`,
     };
   }
@@ -285,35 +195,24 @@ export function createManagedSkill(
     "Created managed skill",
   );
 
-  let indexUpdated = false;
-  if (params.addToIndex !== false) {
-    upsertSkillsIndexEntry(params.id);
-    indexUpdated = true;
-  }
-
-  return { created: true, path: skillFilePath, indexUpdated };
+  return { created: true, path: skillFilePath };
 }
 
 interface DeleteManagedSkillResult {
   deleted: boolean;
-  indexUpdated: boolean;
   error?: string;
 }
 
-export function deleteManagedSkill(
-  id: string,
-  removeFromIndex = true,
-): DeleteManagedSkillResult {
+export function deleteManagedSkill(id: string): DeleteManagedSkillResult {
   const validationError = validateManagedSkillId(id);
   if (validationError) {
-    return { deleted: false, indexUpdated: false, error: validationError };
+    return { deleted: false, error: validationError };
   }
 
   const skillDir = getManagedSkillDir(id);
   if (!existsSync(skillDir)) {
     return {
       deleted: false,
-      indexUpdated: false,
       error: `Managed skill "${id}" not found`,
     };
   }
@@ -322,19 +221,5 @@ export function deleteManagedSkill(
   deleteSkillCapabilityNode(id);
   log.info({ id, path: skillDir }, "Deleted managed skill");
 
-  let indexUpdated = false;
-  if (removeFromIndex) {
-    try {
-      removeSkillsIndexEntry(id);
-      indexUpdated = true;
-    } catch (err) {
-      // Best-effort: skill dir is already gone, don't fail the whole delete
-      log.warn(
-        { id, err },
-        "Failed to update skills index after deleting managed skill",
-      );
-    }
-  }
-
-  return { deleted: true, indexUpdated };
+  return { deleted: true };
 }

package/src/skills/skillssh-registry.ts

@@ -1,10 +1,13 @@
-import { execSync } from "node:child_process";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve, sep } from "node:path";
+import { existsSync, rmSync } from "node:fs";
+import { join } from "node:path";
 
 import { getWorkspaceSkillsDir } from "../util/platform.js";
-import { upsertSkillsIndex } from "./catalog-install.js";
+import {
+  commitStagedSkillInstall,
+  createSkillInstallStagingDir,
+  installSkillDependenciesIfPresent,
+  writeSkillFilesToDir,
+} from "./catalog-install.js";
 import { computeSkillHash, writeInstallMeta } from "./install-meta.js";
 import type {
   AuditResponse,
@@ -421,10 +424,10 @@ export function validateSkillSlug(slug: string): void {
  *
  * 1. Validates the skill slug for path safety
  * 2. Fetches all files from `skills/<skillSlug>/` in the source repo
- * 3. Writes them to `<workspace>/skills/<skillSlug>/` with path traversal protection
+ * 3. Writes them to a non-discovered staging dir with path traversal protection
  * 4. Writes `install-meta.json` with origin metadata
  * 5. Installs npm dependencies (if package.json exists)
- * 6. Updates SKILLS.md index
+ * 6. Atomically swaps the staged skill into `<workspace>/skills/<skillSlug>/`
  *
  * Auto-enable and memory seeding are handled by the caller (e.g.
  * `postInstallSkill()` in the daemon, or left to the user for CLI installs).
@@ -451,47 +454,23 @@ export async function installExternalSkill(
 
   const files = await fetchSkillFromGitHub(owner, repo, skillSlug, ref);
 
-  // Clear existing directory on overwrite to remove stale files
-  if (overwrite && existsSync(skillDir)) {
-    rmSync(skillDir, { recursive: true, force: true });
-  }
-  mkdirSync(skillDir, { recursive: true });
-
-  // Write files with path traversal protection (follows extractTarToDir pattern)
-  for (const [filename, content] of Object.entries(files)) {
-    const normalized = filename.replace(/\\/g, "/").replace(/^\.\/+/g, "");
-    if (!normalized || normalized.includes("..") || normalized.startsWith("/"))
-      continue;
-    const destPath = resolve(skillDir, normalized);
-    if (
-      !destPath.startsWith(resolve(skillDir) + sep) &&
-      destPath !== resolve(skillDir)
-    )
-      continue;
-    mkdirSync(dirname(destPath), { recursive: true });
-    writeFileSync(destPath, content, "utf-8");
-  }
-
-  // Write install metadata
-  writeInstallMeta(skillDir, {
-    origin: "skillssh",
-    slug: skillSlug,
-    sourceRepo: `${owner}/${repo}`,
-    installedAt: new Date().toISOString(),
-    ...(contactId ? { installedBy: contactId } : {}),
-    contentHash: computeSkillHash(skillDir) ?? undefined,
-  });
-
-  // Post-install: install dependencies first, then index the skill.
-  // Running bun install before upsertSkillsIndex ensures we don't index a
-  // skill whose dependencies failed to install.
-  if (existsSync(join(skillDir, "package.json"))) {
-    const bunPath = `${homedir()}/.bun/bin`;
-    execSync("bun install", {
-      cwd: skillDir,
-      stdio: "inherit",
-      env: { ...process.env, PATH: `${bunPath}:${process.env.PATH}` },
+  const stagedDir = createSkillInstallStagingDir();
+  try {
+    writeSkillFilesToDir(files, stagedDir);
+
+    writeInstallMeta(stagedDir, {
+      origin: "skillssh",
+      slug: skillSlug,
+      sourceRepo: `${owner}/${repo}`,
+      installedAt: new Date().toISOString(),
+      ...(contactId ? { installedBy: contactId } : {}),
+      contentHash: computeSkillHash(stagedDir) ?? undefined,
     });
+
+    installSkillDependenciesIfPresent(stagedDir);
+    commitStagedSkillInstall(skillSlug, stagedDir);
+  } catch (err) {
+    rmSync(stagedDir, { recursive: true, force: true });
+    throw err;
   }
-  upsertSkillsIndex(skillSlug);
 }

package/src/subagent/manager.ts

@@ -10,15 +10,18 @@
 
 import { v4 as uuid } from "uuid";
 
+import { resolveCallSiteConfig } from "../config/llm-resolver.js";
 import { getConfig } from "../config/loader.js";
 import { Conversation } from "../daemon/conversation.js";
 import { findConversation } from "../daemon/conversation-store.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
 import { bootstrapConversation } from "../memory/conversation-bootstrap.js";
-import { CallSiteRoutingProvider } from "../providers/call-site-routing.js";
+import { wrapWithCallSiteRouting } from "../providers/call-site-routing.js";
+import { resolveDefaultProvider } from "../providers/connection-resolution.js";
 import { RateLimitProvider } from "../providers/ratelimit.js";
-import { getProvider } from "../providers/registry.js";
+import { listProviders } from "../providers/registry.js";
 import { createAbortReason } from "../util/abort-reasons.js";
+import { ProviderNotConfiguredError } from "../util/errors.js";
 import { getLogger } from "../util/logger.js";
 import { getSandboxWorkingDir } from "../util/platform.js";
 import {
@@ -111,6 +114,7 @@ export interface SubagentNotificationInfo {
   status: "running" | "completed" | "failed" | "aborted";
   error?: string;
   conversationId?: string;
+  objective?: string;
 }
 
 export class SubagentManager {
@@ -181,19 +185,23 @@ export class SubagentManager {
 
     // ── Build conversation dependencies ─────────────────────────────
     const appConfig = getConfig();
-    let provider = getProvider(appConfig.llm.default.provider);
+    // Connection-aware default-provider resolution. Throws
+    // `ConnectionResolutionError` if `llm.default.provider_connection` is
+    // unset or the connection row is missing/mismatched (config bugs).
+    // Returns null on soft credential failures (missing credential,
+    // platform auth unavailable).
+    const baseProvider = await resolveDefaultProvider(appConfig);
+    if (!baseProvider) {
+      const resolved = resolveCallSiteConfig("mainAgent", appConfig.llm);
+      throw new ProviderNotConfiguredError(resolved.provider, listProviders(), {
+        connectionName: resolved.provider_connection,
+      });
+    }
     // Per-call `options.config.callSite` (e.g. `subagentSpawn`) can resolve
-    // to a provider name that differs from `llm.default.provider`. Wrap the
-    // default provider so the actual transport routes correctly per call,
-    // rather than only forwarding metadata to the default's HTTP client.
-    // See `providers/call-site-routing.ts`.
-    provider = new CallSiteRoutingProvider(provider, (name) => {
-      try {
-        return getProvider(name);
-      } catch {
-        return undefined;
-      }
-    });
+    // to a profile that differs from `llm.default`. The shared wrapper
+    // threads `appConfig` through so per-call alternate-profile routing is
+    // also connection-aware (matches the canonical dispatch path).
+    let provider = wrapWithCallSiteRouting(baseProvider, appConfig);
     const { rateLimit } = appConfig;
     if (rateLimit.maxRequestsPerMinute > 0) {
       provider = new RateLimitProvider(
@@ -225,7 +233,10 @@ export class SubagentManager {
         config.systemPromptOverride ??
         buildSubagentSystemPrompt({ ...config, id: subagentId }, role);
     }
-    const maxTokens = appConfig.llm.default.maxTokens;
+    const maxTokens = resolveCallSiteConfig(
+      "subagentSpawn",
+      appConfig.llm,
+    ).maxTokens;
     const workingDir = getSandboxWorkingDir();
 
     // ── Initialise state ────────────────────────────────────────────
@@ -265,6 +276,7 @@ export class SubagentManager {
       managed.parentSendToClient({
         type: "subagent_event",
         subagentId,
+        conversationId: config.parentConversationId,
         event: msg,
       } as ServerMessage);
     };
@@ -941,6 +953,7 @@ export class SubagentManager {
       label: config.label,
       status: outcome,
       conversationId: managed.state.conversationId,
+      objective: config.objective,
       ...(outcome === "failed"
         ? { error: managed.state.error ?? "Unknown error" }
         : {}),

package/src/telemetry/types.ts

@@ -11,6 +11,27 @@ export interface TelemetryEventBase {
 /** LLM usage event — one per provider API call. */
 export interface LlmUsageTelemetryEvent extends TelemetryEventBase {
   type: "llm_usage";
+  /**
+   * Parent conversation id. Null for LLM calls not tied to a conversation
+   * (memory consolidation, background embedding work, etc.).
+   */
+  conversation_id: string | null;
+  /**
+   * Type of the parent conversation (`"standard"` / `"background"` /
+   * `"scheduled"`). Null when `conversation_id` is null. Daemons predating
+   * this field send no value; downstream consumers treat missing/null as
+   * `"standard"` to preserve back-compat during rollout.
+   */
+  conversation_type: string | null;
+  /**
+   * 1-indexed position of the user turn this LLM call belongs to within
+   * the parent conversation, counting only real user turns (tool-result
+   * rows persisted with role="user" are excluded — same filter as the
+   * `turn` event stream). Computed as the count of user messages with
+   * `created_at <= this_event.created_at`. Null when the LLM call isn't
+   * tied to a conversation, or when no user turn has occurred yet.
+   */
+  turn_index: number | null;
   provider: string;
   model: string;
   input_tokens: number;
@@ -25,9 +46,87 @@ export interface LlmUsageTelemetryEvent extends TelemetryEventBase {
   cost: number | null;
 }
 
+/**
+ * Optional client metadata bag carried on `TurnTelemetryEvent.client`.
+ * Sourced from `messages.metadata.client`, which is populated by HTTP
+ * header middleware reading `x-vellum-browser-family`,
+ * `x-vellum-browser-version`, `x-vellum-client-os`,
+ * `x-vellum-interface-version`. Extensible without a schema change —
+ * lives entirely in the JSON metadata column.
+ */
+export interface TurnTelemetryClientInfo {
+  /** Browser family for `web`/`chrome-extension` interfaces: `"chrome"|"safari"|"firefox"|"edge"`. */
+  browser_family?: string;
+  /** Major browser version only (`"124"`, not the full UA string). */
+  browser_version?: string;
+  /**
+   * User's operating system at message time. For `web`/`chrome-extension`
+   * this comes from `navigator.userAgentData`; for `macos`/`ios` it's
+   * implicit from the interface, but clients may still send it explicitly.
+   */
+  os?: string;
+  /**
+   * Version of the surface app/client (`"0.8.2"` for the macOS app,
+   * web client SHA, etc.) — distinct from `assistant_version` on the
+   * batch envelope, which identifies the daemon. A user can be on an
+   * older surface than the daemon (or vice versa, on web).
+   */
+  interface_version?: string;
+}
+
 /** Turn event — one per user message. */
 export interface TurnTelemetryEvent extends TelemetryEventBase {
   type: "turn";
+  /**
+   * Parent conversation id. Lets analytics group turns by conversation
+   * (e.g. avg turns per conversation, time-to-first-completion).
+   */
+  conversation_id: string;
+  /**
+   * Type of the parent conversation. Lets analytics distinguish
+   * user-initiated turns (`"standard"`) from system-generated prompts
+   * in `"background"` / `"scheduled"` conversations. Daemons predating
+   * this field send no value; downstream consumers should treat a
+   * missing value as `"standard"` to preserve DAU during rollout.
+   */
+  conversation_type: string;
+  /**
+   * 1-indexed position of this user turn within the parent conversation,
+   * counting only real user turns (tool-result rows persisted with
+   * role="user" are excluded — same filter as the turn-event eligibility
+   * predicate). The first user turn in a conversation is `1`.
+   */
+  turn_index: number;
+  /**
+   * Canonical `InterfaceId` enum value identifying the UI surface the
+   * user was interacting from when this turn was created (`"macos"`,
+   * `"ios"`, `"cli"`, `"web"`, `"chrome-extension"`, `"slack"`,
+   * `"telegram"`, `"whatsapp"`, `"email"`, `"phone"`). Sourced from the
+   * `userMessageInterface` field already stamped on `messages.metadata`
+   * by every `persistUserMessage` path that flows through
+   * `TurnChannelContext`.
+   *
+   * Null when the metadata didn't carry the field — historical rows or
+   * system-initiated turns with no inbound client context. Downstream
+   * consumers should treat null as `"unknown"`.
+   */
+  interface_id: string | null;
+  /**
+   * Canonical `ChannelId` enum value identifying the messaging fabric the
+   * user message arrived on (`"vellum"` for in-app from macos/ios/web/
+   * cli/chrome-extension; `"slack"`/`"telegram"`/`"whatsapp"`/`"email"`/
+   * `"phone"` for channel-based interfaces). The 7th `ChannelId` value
+   * (`"platform"`) is APNs-push outbound-only and should never appear
+   * here.
+   */
+  channel_id: string | null;
+  /**
+   * Optional client-side metadata bag. Null when no client headers were
+   * attached to the request that created the user message (most
+   * channel-inbound paths today, and any path the new HTTP header
+   * middleware hasn't been wired to yet).
+   */
+  client: TurnTelemetryClientInfo | null;
 }
 
 /** Lifecycle event — app_open, hatch, etc. */
@@ -36,8 +135,21 @@ export interface LifecycleTelemetryEvent extends TelemetryEventBase {
   event_name: string;
 }
 
+/** Onboarding event — pre-chat selections and Google connect status. */
+export interface OnboardingTelemetryEvent extends TelemetryEventBase {
+  type: "onboarding";
+  screen: string;
+  tools?: string[];
+  tasks?: string[];
+  tone?: string;
+  google_connected?: boolean;
+  google_scopes?: string[];
+  ab_variant?: string;
+}
+
 /** Discriminated union of all telemetry event types. */
 export type TelemetryEvent =
   | LlmUsageTelemetryEvent
   | TurnTelemetryEvent
-  | LifecycleTelemetryEvent;
+  | LifecycleTelemetryEvent
+  | OnboardingTelemetryEvent;