@vellumai/assistant 0.10.6-staging.1 → 0.10.6

package/src/cli/lib/install-from-github.ts

@@ -39,6 +39,7 @@ import {
 import { dirname, join, resolve, sep } from "node:path";
 import { promisify } from "node:util";
 
+import { PRESERVED_ENTRIES } from "../../plugins/plugin-tree-walk.js";
 import { ensureBun } from "../../util/bun-runtime.js";
 import { getWorkspacePluginsDir } from "../../util/platform.js";
 import {
@@ -46,7 +47,6 @@ import {
   computeFingerprint,
   type Fingerprint,
   parseFingerprint,
-  PRESERVED_ENTRIES,
 } from "./plugin-fingerprint.js";
 import {
   fetchMarketplaceEntries,
@@ -246,7 +246,9 @@ export class PluginSourceUnavailableError extends Error {
  * a 403 without it is a genuine authorization failure and stays hard.
  */
 function isTransientUpstreamStatus(res: Response): boolean {
-  if (res.status === 429 || res.status >= 500) return true;
+  if (res.status === 429 || res.status >= 500) {
+    return true;
+  }
   if (res.status === 403) {
     return res.headers.get("x-ratelimit-remaining") === "0";
   }
@@ -302,7 +304,9 @@ async function resolvePluginSource(
     throw err;
   }
 
-  if (!resolved) return null;
+  if (!resolved) {
+    return null;
+  }
 
   return {
     owner: resolved.owner,
@@ -548,9 +552,13 @@ export function finalizeStagedInstall(
   // user config and runtime data.
   if (existsSync(target)) {
     for (const entry of PRESERVED_ENTRIES) {
-      if (entry === INSTALL_META_FILENAME) continue; // sidecar is rewritten above
+      if (entry === INSTALL_META_FILENAME) {
+        continue;
+      } // sidecar is rewritten above
       const src = join(target, entry);
-      if (!existsSync(src)) continue;
+      if (!existsSync(src)) {
+        continue;
+      }
       const dest = join(stagingDir, entry);
       const stat = statSync(src);
       if (stat.isDirectory()) {
@@ -755,8 +763,9 @@ async function copyExternalViaGit(
       // A missing repo/ref (or a private one we can't reach) is a hard
       // not-found, surfaced as zero files. Anything else — network loss, a
       // transient GitHub outage — is retryable, so map it to a 503.
-      if (isGitRefNotFound(err))
+      if (isGitRefNotFound(err)) {
         return { fileCount: 0, commit: null, committedAt: null };
+      }
       throw new PluginSourceUnavailableError(
         `git clone failed for ${sourceLabel(source)} @ ${source.ref}: ${subprocessErrorText(err)}`,
         503,
@@ -865,10 +874,14 @@ async function applyAdapterStub(
     stagingDir,
     deps.fetch,
   );
-  if (stubFileCount === 0) return false;
+  if (stubFileCount === 0) {
+    return false;
+  }
 
   const script = resolvePostinstallScript(name, stagingDir);
-  if (script === null) return false;
+  if (script === null) {
+    return false;
+  }
 
   const run = deps.runPostinstall ?? defaultPostinstallRunner;
   try {
@@ -891,7 +904,9 @@ type PackageManifest = Record<string, unknown>;
 
 /** Parse the `package.json` at `path`, or null if it's absent or unparseable. */
 function readPackageJson(path: string): PackageManifest | null {
-  if (!existsSync(path)) return null;
+  if (!existsSync(path)) {
+    return null;
+  }
   try {
     const parsed: unknown = JSON.parse(readFileSync(path, "utf8"));
     return typeof parsed === "object" &&
@@ -976,7 +991,9 @@ function resolvePostinstallScript(
   stagingDir: string,
 ): string | null {
   const pkgPath = join(stagingDir, "package.json");
-  if (!existsSync(pkgPath)) return null;
+  if (!existsSync(pkgPath)) {
+    return null;
+  }
 
   let parsed: unknown;
   try {
@@ -993,7 +1010,9 @@ function resolvePostinstallScript(
     typeof scripts === "object" && scripts !== null && "postinstall" in scripts
       ? (scripts as { postinstall?: unknown }).postinstall
       : undefined;
-  if (typeof command !== "string" || command.trim() === "") return null;
+  if (typeof command !== "string" || command.trim() === "") {
+    return null;
+  }
 
   const match = /^bun\s+(\S+)$/.exec(command.trim());
   if (!match) {
@@ -1005,7 +1024,9 @@ function resolvePostinstallScript(
   }
 
   let rel = match[1]!;
-  if (rel.startsWith("./")) rel = rel.slice(2);
+  if (rel.startsWith("./")) {
+    rel = rel.slice(2);
+  }
   if (!/\.(?:ts|mts|cts|mjs|cjs|js)$/.test(rel)) {
     throw new PluginPostinstallError(
       name,
@@ -1074,7 +1095,9 @@ function pluginPostinstallEnv(bun: string): NodeJS.ProcessEnv {
       .filter(Boolean)
       .join(":"),
   };
-  if (process.env.HOME) env.HOME = process.env.HOME;
+  if (process.env.HOME) {
+    env.HOME = process.env.HOME;
+  }
   return env;
 }
 
@@ -1090,7 +1113,9 @@ function copyTreeSkippingGit(srcRoot: string, destDir: string): number {
     for (const entry of readdirSync(absDir, { withFileTypes: true })) {
       // Drop git metadata and symlinks: the loader follows neither, and a
       // symlink could otherwise point outside the staging tree.
-      if (relDir === "" && entry.name === ".git") continue;
+      if (relDir === "" && entry.name === ".git") {
+        continue;
+      }
       // Drop a top-level `bunfig.toml`. The adapter postinstall runs `bun` with
       // its cwd at the staged root, and Bun auto-loads `$cwd/bunfig.toml` as
       // project config — including a `preload` list it executes before the
@@ -1101,15 +1126,21 @@ function copyTreeSkippingGit(srcRoot: string, destDir: string): number {
       // consumes `bunfig.toml`. Match case-insensitively because the macOS
       // install target's filesystem is case-insensitive, where Bun would still
       // open a clone-supplied `BUNFIG.TOML`.
-      if (relDir === "" && entry.name.toLowerCase() === "bunfig.toml") continue;
-      if (entry.isSymbolicLink()) continue;
+      if (relDir === "" && entry.name.toLowerCase() === "bunfig.toml") {
+        continue;
+      }
+      if (entry.isSymbolicLink()) {
+        continue;
+      }
 
       const rel = relDir ? join(relDir, entry.name) : entry.name;
       if (entry.isDirectory()) {
         walk(rel);
         continue;
       }
-      if (!entry.isFile()) continue;
+      if (!entry.isFile()) {
+        continue;
+      }
 
       const dest = join(destDir, rel);
       mkdirSync(dirname(dest), { recursive: true });
@@ -1168,7 +1199,9 @@ export const defaultGitRunner: GitRunner = async (args, opts) => {
 function pluginGitEnv(): NodeJS.ProcessEnv {
   const env: NodeJS.ProcessEnv = {};
   for (const [key, value] of Object.entries(process.env)) {
-    if (value !== undefined && !key.startsWith("GIT_")) env[key] = value;
+    if (value !== undefined && !key.startsWith("GIT_")) {
+      env[key] = value;
+    }
   }
   env.GIT_TERMINAL_PROMPT = "0";
   const extraPaths = ["/opt/homebrew/bin", "/usr/local/bin"];
@@ -1199,12 +1232,16 @@ interface WriteInstallMetaParams {
  */
 function readStagedPackageVersion(stagingDir: string): string | undefined {
   const pkgPath = join(stagingDir, "package.json");
-  if (!existsSync(pkgPath)) return undefined;
+  if (!existsSync(pkgPath)) {
+    return undefined;
+  }
   try {
     const parsed: unknown = JSON.parse(readFileSync(pkgPath, "utf8"));
     if (typeof parsed === "object" && parsed !== null) {
       const version = (parsed as Record<string, unknown>).version;
-      if (typeof version === "string" && version.length > 0) return version;
+      if (typeof version === "string" && version.length > 0) {
+        return version;
+      }
     }
   } catch {
     // fall through to undefined
@@ -1267,7 +1304,9 @@ function writeInstallMeta(
  */
 export function readInstallMeta(pluginDir: string): InstallMeta | null {
   const metaPath = join(pluginDir, INSTALL_META_FILENAME);
-  if (!existsSync(metaPath)) return null;
+  if (!existsSync(metaPath)) {
+    return null;
+  }
 
   let parsed: unknown;
   try {
@@ -1343,12 +1382,16 @@ async function copyDir(
   fetchFn: FetchLike,
 ): Promise<number> {
   const entries = await listDir(owner, repo, apiPath, ref, fetchFn);
-  if (entries === null) return 0;
+  if (entries === null) {
+    return 0;
+  }
 
   let count = 0;
   for (const entry of entries) {
     // The daemon loader follows neither symlinks nor submodules; skip them.
-    if (entry.type === "symlink" || entry.type === "submodule") continue;
+    if (entry.type === "symlink" || entry.type === "submodule") {
+      continue;
+    }
     assertSafeFilename("entry name", entry.name);
 
     if (entry.type === "dir") {
@@ -1402,7 +1445,9 @@ async function listDir(
     `/contents/${encodeURIComponent(apiPath).replaceAll("%2F", "/")}?ref=${encodeURIComponent(ref)}`;
 
   const res = await githubFetch(url, "application/vnd.github+json", fetchFn);
-  if (res.status === 404) return null;
+  if (res.status === 404) {
+    return null;
+  }
   if (!res.ok) {
     const label = `GitHub contents listing failed for ${apiPath} @ ${ref}: HTTP ${res.status}`;
     if (isTransientUpstreamStatus(res)) {

package/src/cli/lib/ipc-params.ts

@@ -10,9 +10,9 @@
 /** Keys that are CLI-presentation concerns, not IPC params. */
 const CLI_ONLY_KEYS = new Set(["json", "verbose"]);
 
-export function optsToQueryParams(
-  opts: Record<string, unknown>,
-): { queryParams: Record<string, string> } {
+export function optsToQueryParams(opts: Record<string, unknown>): {
+  queryParams: Record<string, string>;
+} {
   const queryParams: Record<string, string> = {};
   for (const [k, v] of Object.entries(opts)) {
     if (CLI_ONLY_KEYS.has(k)) continue;

package/src/cli/lib/list-installed-plugins.ts

@@ -206,9 +206,7 @@ export function listAllPlugins(
   // ── User plugins ───────────────────────────────────────────────────────
   // Filter out default-plugin stub directories (created by `plugins disable
   // default-<name>`) so they don't show up as duplicate user entries.
-  const defaultNames = new Set(
-    readDefaultPluginManifests().map((m) => m.name),
-  );
+  const defaultNames = new Set(readDefaultPluginManifests().map((m) => m.name));
   const userPlugins: AllPluginInfo[] = listInstalledPlugins(opts)
     .filter((entry) => !defaultNames.has(entry.name))
     .map((entry) => ({
@@ -255,7 +253,12 @@ export function listAllPlugins(
   );
   // enabledDefault and disabledDefault keep repo array order (no sort).
 
-  return [...enabledUser, ...disabledUser, ...enabledDefault, ...disabledDefault];
+  return [
+    ...enabledUser,
+    ...disabledUser,
+    ...enabledDefault,
+    ...disabledDefault,
+  ];
 }
 
 interface DefaultPluginManifest {
@@ -309,7 +312,10 @@ function getPluginInstallDate(plugin: AllPluginInfo): number {
   const metaPath = join(plugin.target, "install-meta.json");
   try {
     if (existsSync(metaPath)) {
-      const raw = JSON.parse(readFileSync(metaPath, "utf8")) as Record<string, unknown>;
+      const raw = JSON.parse(readFileSync(metaPath, "utf8")) as Record<
+        string,
+        unknown
+      >;
       if (typeof raw.installedAt === "string") {
         const ms = Date.parse(raw.installedAt);
         if (Number.isFinite(ms)) return ms;

package/src/cli/lib/merge-plugin-tree.ts

@@ -44,10 +44,8 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { promisify } from "node:util";
 
-import {
-  computeFingerprint,
-  PRESERVED_ENTRIES,
-} from "./plugin-fingerprint.js";
+import { PRESERVED_ENTRIES } from "../../plugins/plugin-tree-walk.js";
+import { computeFingerprint } from "./plugin-fingerprint.js";
 
 const execFileAsync = promisify(execFile);
 
@@ -122,7 +120,9 @@ interface MergedFile {
 function isBinary(buf: Buffer): boolean {
   const len = Math.min(buf.length, 8000);
   for (let i = 0; i < len; i++) {
-    if (buf[i] === 0) return true;
+    if (buf[i] === 0) {
+      return true;
+    }
   }
   return false;
 }
@@ -153,10 +153,12 @@ async function threeWayMergeFile(
   labels: ConflictLabels,
 ): Promise<MergedFile> {
   if (isBinary(ours) || isBinary(base) || isBinary(theirs)) {
-    if (ours.equals(base))
+    if (ours.equals(base)) {
       return { content: theirs, conflicted: false, binaryConflicted: false };
-    if (theirs.equals(base))
+    }
+    if (theirs.equals(base)) {
       return { content: ours, conflicted: false, binaryConflicted: false };
+    }
     if (strategy === "assistant") {
       return { content: ours, conflicted: false, binaryConflicted: true };
     }
@@ -287,8 +289,12 @@ export async function mergePluginTree({
           labels,
         );
         keep(rel, merged.content);
-        if (merged.conflicted) conflicts.push(rel);
-        if (merged.binaryConflicted) binaryConflicts.push(rel);
+        if (merged.conflicted) {
+          conflicts.push(rel);
+        }
+        if (merged.binaryConflicted) {
+          binaryConflicts.push(rel);
+        }
       }
       continue;
     }

package/src/cli/lib/plugin-fingerprint.ts

@@ -159,12 +159,6 @@ export function parseFingerprint(value: unknown): Fingerprint | null {
   return { algorithm: "sha256", files };
 }
 
-// The preserved-entries constant lives with the shared walk so install
-// fingerprinting and the live-reload source fingerprint can't disagree on
-// what counts as the plugin's source tree; re-exported here for the
-// install/upgrade/diff callers that treat this module as the fingerprint API.
-export { PRESERVED_ENTRIES } from "../../plugins/plugin-tree-walk.js";
-
 /**
  * Aggregate SHA-256 digest over a tree's contents, returned as `v2:<hex>`.
  *

package/src/cli/lib/publish-plugin.ts

@@ -609,7 +609,7 @@ export async function runPublish(
     }
     return false;
   }
-}/**
+} /**
  * Format a publish result for terminal output.
  */
 export function formatPublishResult(result: PublishResult): string {

package/src/cli/lib/unknown-command.ts

@@ -46,7 +46,9 @@ export function detectUnknownCommand(
   if (known.has(firstPositional)) return null;
 
   const suggestion = findClosestCommand(firstPositional, [...known]);
-  return suggestion ? { token: firstPositional, suggestion } : { token: firstPositional };
+  return suggestion
+    ? { token: firstPositional, suggestion }
+    : { token: firstPositional };
 }
 
 /**

package/src/cli/lib/upgrade-plugin.ts

@@ -32,6 +32,7 @@ import { existsSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 
+import { PRESERVED_ENTRIES } from "../../plugins/plugin-tree-walk.js";
 import { getWorkspacePluginsDir } from "../../util/platform.js";
 import {
   inspectPlugin,
@@ -55,11 +56,7 @@ import {
   sanitizePluginName,
 } from "./install-from-github.js";
 import { type ConflictLabels, mergePluginTree } from "./merge-plugin-tree.js";
-import {
-  computeFingerprint,
-  fingerprintsEqual,
-  PRESERVED_ENTRIES,
-} from "./plugin-fingerprint.js";
+import { computeFingerprint, fingerprintsEqual } from "./plugin-fingerprint.js";
 import { PluginNotInstalledError } from "./uninstall-plugin.js";
 
 /**

package/src/config/__tests__/sync-gated-profiles.test.ts

@@ -110,7 +110,7 @@ describe("reconcileFlagGatedProfiles", () => {
     const raw = readConfig();
     const osBeta = raw.llm.profiles["os-beta"]!;
     expect(osBeta.model).toBe("MiniMaxAI/MiniMax-M3");
-    expect(osBeta.provider_connection).toBe("together-managed");
+    expect(osBeta.provider_connection).toBe("vellum");
     expect(osBeta.provider).toBe("together");
     expect(osBeta.source).toBe("managed");
     expect(osBeta.label).toBe("OS Beta");
@@ -164,7 +164,7 @@ describe("reconcileFlagGatedProfiles", () => {
     expect(after.status).toBe("disabled");
     expect(after.topP).toBe(0.8);
     expect(after.model).toBe("MiniMaxAI/MiniMax-M3");
-    expect(after.provider_connection).toBe("together-managed");
+    expect(after.provider_connection).toBe("vellum");
     expect(after.effort).toBe("low");
   });
 

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

@@ -4,6 +4,7 @@ import {
   getConnection,
   MANAGED_CONNECTION_NAMES,
   PROVIDERS_REQUIRING_BASE_URL_AND_MODELS,
+  VELLUM_MANAGED_CONNECTION_NAME,
 } from "../providers/inference/connections.js";
 import { PROVIDER_CATALOG } from "../providers/model-catalog.js";
 import { resolveModelIntent } from "../providers/model-intents.js";
@@ -49,7 +50,7 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   balanced: {
     model: "accounts/fireworks/models/glm-5p2",
     provider: "fireworks",
-    connectionName: "fireworks-managed",
+    connectionName: VELLUM_MANAGED_CONNECTION_NAME,
     source: "managed",
     label: "Balanced",
     description: "Good balance of quality, cost, and speed",
@@ -64,7 +65,7 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   "quality-optimized": {
     intent: "quality-optimized",
     provider: "anthropic",
-    connectionName: "anthropic-managed",
+    connectionName: VELLUM_MANAGED_CONNECTION_NAME,
     source: "managed",
     label: "Quality",
     description: "High-quality results with the most capable model",
@@ -85,7 +86,7 @@ const MANAGED_PROFILE_TEMPLATES: Record<string, ManagedProfileTemplate> = {
   "cost-optimized": {
     model: "accounts/fireworks/models/deepseek-v4-flash",
     provider: "fireworks",
-    connectionName: "fireworks-managed",
+    connectionName: VELLUM_MANAGED_CONNECTION_NAME,
     source: "managed",
     label: "Speed",
     description: "Fastest responses at lower cost (DeepSeek V4 Flash)",
@@ -154,7 +155,7 @@ export const OS_BETA_FEATURE_FLAG_KEY = "os-beta";
 export const OS_BETA_PROFILE_TEMPLATE: ManagedProfileTemplate = {
   intent: "balanced",
   provider: "together",
-  connectionName: "together-managed",
+  connectionName: VELLUM_MANAGED_CONNECTION_NAME,
   source: "managed",
   label: "OS Beta",
   description: "Good balance of quality, cost, and speed, in beta",

package/src/daemon/conversation-lifecycle.ts

@@ -4,6 +4,10 @@
  * can delegate without exposing its full surface.
  */
 
+import {
+  formatImageSourceAnnotation,
+  formatStoredPathAnnotation,
+} from "../agent/attachments.js";
 import { getConfig } from "../config/loader.js";
 import type { EventBus } from "../events/bus.js";
 import type { AssistantDomainEvents } from "../events/domain-events.js";
@@ -32,14 +36,19 @@ import type { SurfaceData, SurfaceType } from "./message-protocol.js";
 const log = getLogger("conversation-lifecycle");
 
 /**
- * Re-inject image source path annotations into message content blocks.
+ * Re-inject attachment path annotations into message content blocks.
  *
- * When the desktop client attaches images from local files, the source paths
- * are stored in `metadata.imageSourcePaths` (keyed by filename). The LLM-facing
- * content omits these paths at persistence time, so we re-inject them when
- * loading history from the DB. Only user messages are annotated.
+ * The LLM-facing content omits path annotations at persistence time, so we
+ * re-inject them when loading history from the DB, from two metadata keys:
+ * `imageSourcePaths` (where desktop-attached images came from) and
+ * `attachmentStoredPaths` (the canonical, collision-suffixed copies in the
+ * conversation's attachments/ directory), both keyed by
+ * `${position}:${filename}`. The rebuilt block must stay byte-identical to
+ * the one `enrichMessageWithSourcePaths` appends at persist time so reloads
+ * and forks keep provider prefix-cache parity. Only user messages are
+ * annotated.
  */
-export function reinjectImageSourcePaths(
+export function reinjectAttachmentPathAnnotations(
   content: ContentBlock[],
   role: string,
   metadataJson: string | null,
@@ -47,17 +56,30 @@ export function reinjectImageSourcePaths(
   if (role !== "user" || !metadataJson) return content;
   try {
     const meta = JSON.parse(metadataJson);
-    if (!meta.imageSourcePaths || typeof meta.imageSourcePaths !== "object") {
+    const lines: string[] = [];
+    if (meta.imageSourcePaths && typeof meta.imageSourcePaths === "object") {
+      for (const p of Object.values(meta.imageSourcePaths)) {
+        if (typeof p === "string") {
+          lines.push(formatImageSourceAnnotation(p));
+        }
+      }
+    }
+    if (
+      meta.attachmentStoredPaths &&
+      typeof meta.attachmentStoredPaths === "object"
+    ) {
+      for (const [key, p] of Object.entries(meta.attachmentStoredPaths)) {
+        if (typeof p !== "string") {
+          continue;
+        }
+        const filename = key.slice(key.indexOf(":") + 1);
+        lines.push(formatStoredPathAnnotation(filename, p));
+      }
+    }
+    if (lines.length === 0) {
       return content;
     }
-    const paths = Object.values(meta.imageSourcePaths).filter(
-      (v): v is string => typeof v === "string",
-    );
-    if (paths.length === 0) return content;
-    const annotation = paths
-      .map((p) => `[Attached image source: ${p}]`)
-      .join("\n");
-    return [...content, { type: "text" as const, text: annotation }];
+    return [...content, { type: "text" as const, text: lines.join("\n") }];
   } catch {
     // metadata parse failure — skip annotation, not critical
     return content;