@vellumai/assistant 0.10.7 → 0.10.8-dev.202607102228.5945895

package/src/runtime/routes/plugins-routes.ts

@@ -23,6 +23,9 @@
  * `get_route_schema` so the gateway's IPC proxy stays in sync.
  */
 
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
 import { z } from "zod";
 
 import {
@@ -34,24 +37,29 @@ import {
   PluginInspectNotFoundError,
 } from "../../cli/lib/inspect-plugin.js";
 import {
-  DEFAULT_PLUGIN_REF,
   installPlugin,
   InvalidPluginNameError,
   PluginAlreadyInstalledError,
   PluginNotFoundError,
   PluginSourceUnavailableError,
+  sanitizePluginName,
 } from "../../cli/lib/install-from-github.js";
 import {
   type InstalledPluginInfo,
   listInstalledPlugins,
 } from "../../cli/lib/list-installed-plugins.js";
 import { getPluginCatalog } from "../../cli/lib/plugin-catalog-cache.js";
+import {
+  DEFAULT_PIN_HISTORY_LIMIT,
+  DEFAULT_PLUGIN_REF,
+  type PluginUpgradeStrategy,
+} from "../../cli/lib/plugin-constants.js";
 import {
   getPluginDetails,
   PluginDetailsNotFoundError,
 } from "../../cli/lib/plugin-details.js";
+import { readValidatedPluginIcon } from "../../cli/lib/plugin-icon-file.js";
 import {
-  DEFAULT_PIN_HISTORY_LIMIT,
   listPinHistory,
   PluginPinHistoryError,
   resolvePinToMarketplaceCommit,
@@ -77,11 +85,12 @@ import {
 import {
   PluginMergeBaselineError,
   PluginNotUpgradableError,
-  type PluginUpgradeStrategy,
   upgradePlugin,
 } from "../../cli/lib/upgrade-plugin.js";
 import { isPluginDisabled } from "../../plugins/disabled-state.js";
+import { ensurePluginApiShim } from "../../plugins/ensure-plugin-api-shim.js";
 import { getLocalCategorySlugs } from "../../skills/categories-cache.js";
+import { getWorkspacePluginsDir } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   getOriginClientId,
@@ -96,6 +105,7 @@ import {
   ServiceUnavailableError,
 } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
+import { RouteResponse } from "./types.js";
 
 // ---------------------------------------------------------------------------
 // Schema
@@ -138,6 +148,24 @@ const pluginInfoSchema = z.object({
     .describe(
       "Marketplace category slug (Skills taxonomy); null when origin/category is unknown, e.g. non-marketplace installs.",
     ),
+  icon: z
+    .string()
+    .optional()
+    .describe(
+      "Author-declared emoji icon from the plugin's package.json vellum.icon; absent when none.",
+    ),
+  hasIcon: z
+    .boolean()
+    .optional()
+    .describe(
+      "Whether the plugin ships a valid author-bundled `icon.png` (PNG magic + dimensions + size validated). Drives whether a client fetches the bundled icon.",
+    ),
+  iconVersion: z
+    .string()
+    .optional()
+    .describe(
+      "Content hash of the validated `icon.png`; present only when `hasIcon` is true. Use it as a cache-buster for the bundled-icon endpoint.",
+    ),
 });
 
 const pluginsListResponseSchema = z.object({
@@ -274,6 +302,23 @@ const pluginDetailsResponseSchema = z.object({
     .describe(
       "Prebuilt client artifact from `package.json` `vellum.artifact`, or null when the plugin ships none or its descriptor is incomplete (e.g. a placeholder sha256).",
     ),
+  icon: z
+    .string()
+    .nullable()
+    .describe(
+      "Author-declared emoji icon from the plugin's `package.json` `vellum.icon`, or null when none.",
+    ),
+  hasIcon: z
+    .boolean()
+    .describe(
+      "Whether the locally installed copy ships a valid author-bundled `icon.png` (PNG magic + dimensions + size validated). Always false when the plugin is not installed.",
+    ),
+  iconVersion: z
+    .string()
+    .nullable()
+    .describe(
+      "Content hash of the validated `icon.png`; null when `hasIcon` is false. Use it as a cache-buster for the bundled-icon endpoint.",
+    ),
 });
 
 const pluginInstallRequestSchema = z.object({
@@ -658,6 +703,9 @@ interface PluginView {
   path: string;
   issues?: string[];
   category?: string | null;
+  icon?: string;
+  hasIcon: boolean;
+  iconVersion?: string;
 }
 
 function projectPlugin(entry: InstalledPluginInfo): PluginView {
@@ -672,10 +720,17 @@ function projectPlugin(entry: InstalledPluginInfo): PluginView {
     description: entry.packageJson?.description ?? null,
     version: entry.packageJson?.version ?? null,
     path: entry.target,
+    hasIcon: entry.hasIcon,
   };
   if (entry.issues.length > 0) {
     view.issues = [...entry.issues];
   }
+  if (entry.packageJson?.icon !== undefined) {
+    view.icon = entry.packageJson.icon;
+  }
+  if (entry.iconVersion !== undefined) {
+    view.iconVersion = entry.iconVersion;
+  }
   return view;
 }
 
@@ -701,9 +756,13 @@ export function normalizeMarketplaceCategory(
   raw: string | null | undefined,
   validSlugs: Set<string>,
 ): string | null {
-  if (!raw) return null;
+  if (!raw) {
+    return null;
+  }
   const slug = raw.trim().toLowerCase();
-  if (!slug) return null;
+  if (!slug) {
+    return null;
+  }
   const aliased = MARKETPLACE_CATEGORY_ALIASES[slug] ?? slug;
   return validSlugs.has(aliased) ? aliased : null;
 }
@@ -760,8 +819,12 @@ function projectMatch(
 
 function matchesQuery(plugin: PluginView, needle: string): boolean {
   const q = needle.toLowerCase();
-  if (plugin.id.toLowerCase().includes(q)) return true;
-  if (plugin.name.toLowerCase().includes(q)) return true;
+  if (plugin.id.toLowerCase().includes(q)) {
+    return true;
+  }
+  if (plugin.name.toLowerCase().includes(q)) {
+    return true;
+  }
   if (plugin.description && plugin.description.toLowerCase().includes(q)) {
     return true;
   }
@@ -805,12 +868,16 @@ export async function loadCategoryMapBounded(
         timer = setTimeout(() => resolve(null), timeoutMs);
       }),
     ]);
-    if (!catalog) return new Map();
+    if (!catalog) {
+      return new Map();
+    }
     return new Map(catalog.matches.map((m) => [m.name, m.category]));
   } catch {
     return new Map();
   } finally {
-    if (timer) clearTimeout(timer);
+    if (timer) {
+      clearTimeout(timer);
+    }
   }
 }
 
@@ -939,18 +1006,28 @@ interface PluginUninstallResponse {
   target: string;
 }
 
-function handleUninstallPlugin({
+async function handleUninstallPlugin({
   pathParams = {},
   headers,
-}: RouteHandlerArgs): PluginUninstallResponse {
+}: RouteHandlerArgs): Promise<PluginUninstallResponse> {
   // The HTTP router has already URL-decoded `:name` for us; pass it
   // through verbatim — `uninstallPlugin` runs the same
   // `sanitizePluginName` check the CLI uses, so attacker-supplied
   // `../escape` style names get rejected before `rmSync` is reached.
   const rawName = pathParams.name ?? "";
 
+  // The daemon marks itself DB-ready and serves HTTP before
+  // `initializePlugins()` materializes the workspace `@vellumai/plugin-api`
+  // shim, so a DELETE that lands in that boot window would run a plugin's
+  // `shutdown` hook before the shim exists — a hook importing the package
+  // would fail to resolve and be silently skipped before the directory is
+  // removed. Ensure the shim here first. Best-effort and idempotent: outside
+  // that window it's a cheap no-op rewrite, and a failure just means such a
+  // hook's import may not resolve.
+  await ensurePluginApiShim().catch(() => {});
+
   try {
-    const result = uninstallPlugin({ name: rawName });
+    const result = await uninstallPlugin({ name: rawName });
     publishPluginsChanged(getOriginClientId(headers));
     return { name: result.name, target: result.target };
   } catch (err) {
@@ -1010,7 +1087,9 @@ async function resolveInstallMarketplaceRef(
   name: string,
   pin: string | undefined,
 ): Promise<string> {
-  if (!pin) return DEFAULT_PLUGIN_REF;
+  if (!pin) {
+    return DEFAULT_PLUGIN_REF;
+  }
   const entry = await resolvePinToMarketplaceCommit(name, pin, {
     fetch: globalThis.fetch.bind(globalThis),
   });
@@ -1317,6 +1396,50 @@ function handleDisablePlugin({ pathParams = {}, headers }: RouteHandlerArgs) {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Handler — icon (bundled icon.png)
+// ---------------------------------------------------------------------------
+
+/**
+ * Serve an installed plugin's validated author-bundled `icon.png` as
+ * `image/png`. Side-effect-free: the on-disk icon is re-validated on read and
+ * never mutated. `sanitizePluginName` rejects a traversal name (`../escape`)
+ * with a 400 before it becomes a filesystem path. The content-hash
+ * `iconVersion` is the `ETag` and the bytes are immutable-cacheable, so a byte
+ * change yields a new hash — clients refetch off the `hasIcon` / `iconVersion`
+ * fields on the list / detail responses.
+ */
+function handleGetPluginIcon({
+  pathParams = {},
+}: RouteHandlerArgs): RouteResponse {
+  let name: string;
+  try {
+    name = sanitizePluginName(pathParams.name ?? "");
+  } catch (err) {
+    if (err instanceof InvalidPluginNameError) {
+      throw new BadRequestError(err.message);
+    }
+    throw err;
+  }
+
+  const v = readValidatedPluginIcon(join(getWorkspacePluginsDir(), name));
+  if (!v.hasIcon || !v.path) {
+    throw new NotFoundError("Plugin icon not found");
+  }
+
+  const bytes = readFileSync(v.path);
+  return new RouteResponse(new Uint8Array(bytes), {
+    "Content-Type": "image/png",
+    "Content-Length": String(bytes.length),
+    // `private`: the icon is an authenticated, workspace-specific resource, so
+    // no shared/proxy cache may reuse it across requests. The content-hash
+    // ETag + immutable still let the browser cache aggressively.
+    "Cache-Control": "private, max-age=31536000, immutable",
+    ETag: `"${v.iconVersion}"`,
+    "X-Content-Type-Options": "nosniff",
+  });
+}
+
 // ---------------------------------------------------------------------------
 // Route definitions
 // ---------------------------------------------------------------------------
@@ -1390,7 +1513,7 @@ export const ROUTES: RouteDefinition[] = [
     },
     summary: "Install a plugin",
     description:
-      "Install a plugin by name from the canonical source — a whitelisted `plugins/marketplace.json` entry. Always resolves against the curated default git ref (no caller-supplied ref): installing from an unreviewed revision would bypass the marketplace curation boundary and let attacker-controlled code be loaded. Materializes the plugin under `<workspaceDir>/plugins/<name>/`; the assistant must be restarted to load it. Mirrors the CLI's `assistant plugins install <name>`. An already-installed name without `force` returns 409; a name that resolves to nothing returns 404. Sibling to `POST /v1/skills/install`.",
+      "Install a plugin by name from the canonical source — a whitelisted `plugins/marketplace.json` entry. Always resolves against the curated default git ref (no caller-supplied ref): installing from an unreviewed revision would bypass the marketplace curation boundary and let attacker-controlled code be loaded. Materializes the plugin under `<workspaceDir>/plugins/<name>/`; the plugin is picked up live on the next read (no restart required). Mirrors the CLI's `assistant plugins install <name>`. An already-installed name without `force` returns 409; a name that resolves to nothing returns 404. Sibling to `POST /v1/skills/install`.",
     tags: ["plugins"],
     requestBody: pluginInstallRequestSchema,
     responseBody: pluginInstallResponseSchema,
@@ -1451,6 +1574,36 @@ export const ROUTES: RouteDefinition[] = [
     },
     handler: handleGetPluginDetails,
   },
+  {
+    operationId: "plugins_icon",
+    endpoint: "plugins/:name/icon",
+    method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
+    summary: "Serve a plugin's bundled icon",
+    description:
+      "Serve the installed plugin's validated author-bundled `icon.png` as `image/png`. The PNG is re-validated on read (magic bytes + IHDR dimensions + size) and served with an immutable `Cache-Control` plus a content-hash `ETag` — the `iconVersion` reported by `GET /v1/plugins` and `GET /v1/plugins/:name` — so clients cache aggressively and only refetch when the hash changes. A plugin with no valid bundled icon returns 404; a malformed name returns 400. Pair with the `hasIcon` / `iconVersion` fields on the list and detail responses to decide whether to fetch.",
+    tags: ["plugins"],
+    pathParams: [
+      {
+        name: "name",
+        type: "string",
+        description: "Install name (kebab-case).",
+      },
+    ],
+    responseBody: {
+      contentType: "image/png",
+      schema: { type: "string", format: "binary" },
+    },
+    additionalResponses: {
+      "404": {
+        description: "No installed plugin with the given name has an icon.",
+      },
+    },
+    handler: handleGetPluginIcon,
+  },
   {
     operationId: "plugins_uninstall",
     endpoint: "plugins/:name",
@@ -1461,7 +1614,7 @@ export const ROUTES: RouteDefinition[] = [
     },
     summary: "Uninstall a plugin",
     description:
-      "Remove the directory at `<workspaceDir>/plugins/<name>/`. Mirrors the CLI's `assistant plugins uninstall <name>` (without the interactive confirmation — the API caller is responsible for any prompt). The plugin name is sanitized by the same regex the CLI uses; `../escape`-style values, hidden names, and absolute paths return 400. Missing plugins return 404. The assistant must be restarted to drop the plugin from the running runtime.",
+      "Remove the directory at `<workspaceDir>/plugins/<name>/`. Mirrors the CLI's `assistant plugins uninstall <name>` (without the interactive confirmation — the API caller is responsible for any prompt). The plugin name is sanitized by the same regex the CLI uses; `../escape`-style values, hidden names, and absolute paths return 400. Missing plugins return 404. The plugin is dropped from the running runtime live on the next read (no restart required).",
     tags: ["plugins"],
     pathParams: [
       {
@@ -1607,7 +1760,7 @@ export const ROUTES: RouteDefinition[] = [
     },
     summary: "Upgrade a plugin to the marketplace pin",
     description:
-      'Move an installed plugin to the marketplace\'s current pinned commit, re-materializing it under `<workspaceDir>/plugins/<name>/`. Always resolves against the curated marketplace pin (no caller-supplied ref), mirroring `plugins install`\'s curation boundary. A no-op (`outcome: "already-up-to-date"`) when the installed commit already equals the pin; pass `dryRun` to preview the move (`outcome: "would-upgrade"`) without touching the install. Installs lacking provenance are re-pinned to the current SHA. The assistant must be restarted to load the upgraded code. `strategy` controls how local edits are reconciled: `overwrite` (default) discards them and re-installs the pin wholesale; `ours`/`theirs`/`assistant` perform a three-way merge against the re-materialized install commit, carrying non-conflicting edits from both sides forward and resolving conflicting hunks toward the local edit (`ours`) or the pin (`theirs`), or writing git conflict markers into the file and reporting them in `conflicts`/`binaryConflicts` for the assistant to resolve (`assistant`). A merge strategy whose install-time baseline cannot be reconstructed returns 409. Mirrors the CLI\'s `assistant plugins upgrade <name> [--strategy <s>]`.',
+      'Move an installed plugin to the marketplace\'s current pinned commit, re-materializing it under `<workspaceDir>/plugins/<name>/`. Always resolves against the curated marketplace pin (no caller-supplied ref), mirroring `plugins install`\'s curation boundary. A no-op (`outcome: "already-up-to-date"`) when the installed commit already equals the pin; pass `dryRun` to preview the move (`outcome: "would-upgrade"`) without touching the install. Installs lacking provenance are re-pinned to the current SHA. The upgraded code is picked up live on the next read (no restart required). `strategy` controls how local edits are reconciled: `overwrite` (default) discards them and re-installs the pin wholesale; `ours`/`theirs`/`assistant` perform a three-way merge against the re-materialized install commit, carrying non-conflicting edits from both sides forward and resolving conflicting hunks toward the local edit (`ours`) or the pin (`theirs`), or writing git conflict markers into the file and reporting them in `conflicts`/`binaryConflicts` for the assistant to resolve (`assistant`). A merge strategy whose install-time baseline cannot be reconstructed returns 409. Mirrors the CLI\'s `assistant plugins upgrade <name> [--strategy <s>]`.',
     tags: ["plugins"],
     pathParams: [
       {

package/src/runtime/routes/schedule-routes.ts

@@ -11,7 +11,10 @@ import { getOrCreateConversation } from "../../daemon/conversation-store.js";
 import { INTERNAL_GUARDIAN_TRUST_CONTEXT } from "../../daemon/trust-context.js";
 import { bootstrapConversation } from "../../persistence/conversation-bootstrap.js";
 import { getConversation } from "../../persistence/conversation-crud.js";
-import { getUsageCostForRun } from "../../persistence/llm-usage-store.js";
+import {
+  getUsageCostForRun,
+  listRunConversationIds,
+} from "../../persistence/llm-usage-store.js";
 import { validateScheduleInferenceProfile } from "../../schedule/inference-profile.js";
 import {
   describeRRuleExpression,
@@ -109,6 +112,20 @@ const scheduleRunSchema = z.object({
   conversationId: z.string().nullable(),
   conversationExists: z.boolean(),
   conversationArchivedAt: z.number().nullable(),
+  // Every real conversation this firing touched. Script runs store a
+  // synthetic "script:<jobId>" sentinel in the legacy `conversationId` field,
+  // so their real conversations are recovered from the usage ledger via
+  // `cron_run_id`. Execute and wake runs contribute their legacy pointer as
+  // well. A pruned conversation keeps its entry with `exists` set to false so
+  // the UI can label it as unavailable.
+  conversations: z.array(
+    z.object({
+      id: z.string(),
+      title: z.string().nullable(),
+      exists: z.boolean(),
+      archivedAt: z.number().nullable(),
+    }),
+  ),
   estimatedCostUsd: z.number(),
   createdAt: z.number(),
 });
@@ -584,6 +601,25 @@ function handleListScheduleRuns(
       const conversation = r.conversationId
         ? getConversation(r.conversationId)
         : null;
+      // The usage ledger supplies every conversation stamped with this run's
+      // cron_run_id. The legacy single pointer is added on top, which covers
+      // runs whose usage predates cron_run_id stamping. The synthetic
+      // "script:<jobId>" sentinel never resolves to a conversation, so it
+      // drops out here on its own.
+      const runConversationIds = new Set(listRunConversationIds(r.id));
+      if (r.conversationId && conversation) {
+        runConversationIds.add(r.conversationId);
+      }
+      const conversations = [...runConversationIds].map((cid) => {
+        const c =
+          cid === r.conversationId ? conversation : getConversation(cid);
+        return {
+          id: cid,
+          title: c?.title ?? null,
+          exists: c != null,
+          archivedAt: c?.archivedAt ?? null,
+        };
+      });
       return {
         id: r.id,
         jobId: r.jobId,
@@ -596,6 +632,7 @@ function handleListScheduleRuns(
         conversationId: r.conversationId,
         conversationExists: conversation != null,
         conversationArchivedAt: conversation?.archivedAt ?? null,
+        conversations,
         estimatedCostUsd: getUsageCostForRun({
           cronRunId: r.id,
           conversationId: r.conversationId ?? undefined,

package/src/runtime/routes/secret-routes.ts

@@ -20,7 +20,6 @@ import { getConfig, invalidateConfigCache } from "../../config/loader.js";
 import { getCesClient } from "../../credential-execution/ces-runtime.js";
 import type { CesClient } from "../../credential-execution/client.js";
 import { evictConversationsForReload } from "../../daemon/conversation-store.js";
-import { setSentryOrganizationId, setSentryUserId } from "../../instrument.js";
 import { syncManualTokenConnection } from "../../oauth/manual-token-connection.js";
 import { clearEmbeddingBackendCache } from "../../persistence/embeddings/embedding-backend.js";
 import { maybeReseedCapabilitiesAfterManagedCredential } from "../../plugins/defaults/memory/v2/memory-v2-startup.js";
@@ -264,10 +263,8 @@ async function handleAddSecret({ body }: RouteHandlerArgs) {
           setPlatformAssistantId(undefined);
         } else if (field === "platform_organization_id") {
           setPlatformOrganizationId(undefined);
-          setSentryOrganizationId(undefined);
         } else if (field === "platform_user_id") {
           setPlatformUserId(undefined);
-          setSentryUserId(undefined);
         }
         deleteCredentialMetadata(service, field);
       } else {
@@ -287,11 +284,9 @@ async function handleAddSecret({ body }: RouteHandlerArgs) {
         }
         if (service === "vellum" && field === "platform_organization_id") {
           setPlatformOrganizationId(effectiveValue || undefined);
-          setSentryOrganizationId(effectiveValue || undefined);
         }
         if (service === "vellum" && field === "platform_user_id") {
           setPlatformUserId(effectiveValue || undefined);
-          setSentryUserId(effectiveValue || undefined);
         }
       }
       if (isManagedProxyCredential(service, field)) {
@@ -522,11 +517,9 @@ async function handleDeleteSecret({ body }: RouteHandlerArgs) {
       }
       if (service === "vellum" && field === "platform_organization_id") {
         setPlatformOrganizationId(undefined);
-        setSentryOrganizationId(undefined);
       }
       if (service === "vellum" && field === "platform_user_id") {
         setPlatformUserId(undefined);
-        setSentryUserId(undefined);
       }
       if (isManagedProxyCredential(service, field)) {
         await refreshProvidersAfterSecretChange();