@vellumai/assistant 0.6.5 → 0.6.6

package/src/config/bundled-skills/contacts/tools/contact-merge.ts

@@ -1,27 +1,11 @@
-import {
-  gatewayGet,
-  gatewayPost,
-  GatewayRequestError,
-} from "../../../../runtime/gateway-internal-client.js";
+import type { ContactWithChannels } from "../../../../contacts/types.js";
+import { cliIpcCall } from "../../../../ipc/cli-client.js";
+import { resolveGuardianName } from "../../../../prompts/user-reference.js";
 import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
 
-interface ContactChannel {
-  type: string;
-  address: string;
-  isPrimary: boolean;
-}
-
-interface ContactResponse {
-  id: string;
-  displayName: string;
-  notes: string | null;
-  interactionCount: number;
-  channels: ContactChannel[];
-}
-
 export async function executeContactMerge(
   input: Record<string, unknown>,
   _context: ToolContext,
@@ -36,79 +20,74 @@ export async function executeContactMerge(
     return { content: "Error: merge_id is required", isError: true };
   }
 
-  try {
-    // Validate both contacts exist before merging
-    const [keepResult, mergeResult] = await Promise.allSettled([
-      gatewayGet<{ ok: boolean; contact: ContactResponse }>(
-        `/v1/contacts/${keepId}`,
-      ),
-      gatewayGet<{ ok: boolean; contact: ContactResponse }>(
-        `/v1/contacts/${mergeId}`,
-      ),
-    ]);
-
-    if (keepResult.status === "rejected") {
-      if (
-        keepResult.reason instanceof GatewayRequestError &&
-        keepResult.reason.statusCode === 404
-      ) {
-        return {
-          content: `Error: Contact "${keepId}" not found`,
-          isError: true,
-        };
-      }
-      throw keepResult.reason;
-    }
-    if (mergeResult.status === "rejected") {
-      if (
-        mergeResult.reason instanceof GatewayRequestError &&
-        mergeResult.reason.statusCode === 404
-      ) {
-        return {
-          content: `Error: Contact "${mergeId}" not found`,
-          isError: true,
-        };
-      }
-      throw mergeResult.reason;
-    }
+  // Validate both contacts exist before merging
+  const [keepRes, mergeRes] = await Promise.all([
+    cliIpcCall<ContactWithChannels | null>("get_contact", { id: keepId }),
+    cliIpcCall<ContactWithChannels | null>("get_contact", { id: mergeId }),
+  ]);
 
-    const keepContact = keepResult.value.contact;
-    const mergeContact = mergeResult.value.contact;
+  if (!keepRes.ok) {
+    return { content: `Error: ${keepRes.error}`, isError: true };
+  }
+  if (!keepRes.result) {
+    return { content: `Error: Contact "${keepId}" not found`, isError: true };
+  }
+  if (!mergeRes.ok) {
+    return { content: `Error: ${mergeRes.error}`, isError: true };
+  }
+  if (!mergeRes.result) {
+    return { content: `Error: Contact "${mergeId}" not found`, isError: true };
+  }
 
-    // Execute the merge
-    const { data: resultData } = await gatewayPost<{
-      ok: boolean;
-      contact: ContactResponse;
-    }>("/v1/contacts/merge", { keepId, mergeId });
-    const merged = resultData.contact;
+  const keepContact = keepRes.result;
+  const mergeContact = mergeRes.result;
 
-    const channelList = merged.channels
-      .map(
-        (ch) =>
-          `  - ${ch.type}: ${ch.address}${ch.isPrimary ? " (primary)" : ""}`,
-      )
-      .join("\n");
+  const mergeResult = await cliIpcCall<ContactWithChannels>("merge_contacts", {
+    keepId,
+    mergeId,
+  });
 
-    return {
-      content: [
-        `Merged "${mergeContact.displayName}" into "${keepContact.displayName}".`,
-        ``,
-        `Surviving contact (${merged.id}):`,
-        `  Name: ${merged.displayName}`,
-        `  Interactions: ${merged.interactionCount}`,
-        merged.notes ? `  Notes: ${merged.notes}` : null,
-        merged.channels.length > 0 ? `  Channels:\n${channelList}` : null,
-        ``,
-        `Deleted contact: ${mergeContact.displayName} (${mergeId})`,
-      ]
-        .filter(Boolean)
-        .join("\n"),
-      isError: false,
-    };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return { content: `Error: ${msg}`, isError: true };
+  if (!mergeResult.ok) {
+    return { content: `Error: ${mergeResult.error}`, isError: true };
   }
+
+  const merged = mergeResult.result!;
+  const displayName =
+    merged.role === "guardian"
+      ? resolveGuardianName(merged.displayName)
+      : merged.displayName;
+  const keepName =
+    keepContact.role === "guardian"
+      ? resolveGuardianName(keepContact.displayName)
+      : keepContact.displayName;
+  const mergeName =
+    mergeContact.role === "guardian"
+      ? resolveGuardianName(mergeContact.displayName)
+      : mergeContact.displayName;
+
+  const channelList = merged.channels
+    .map(
+      (ch) =>
+        `  - ${ch.type}: ${ch.address}${ch.isPrimary ? " (primary)" : ""}`,
+    )
+    .join("\n");
+
+  return {
+    content: [
+      `Merged "${mergeName}" into "${keepName}".`,
+      ``,
+      `Surviving contact (${merged.id}):`,
+      `  Name: ${displayName}`,
+      `  Interactions: ${merged.interactionCount}`,
+      merged.notes ? `  Notes: ${merged.notes}` : null,
+      merged.channels.length > 0 ? `  Channels:\n${channelList}` : null,
+      ``,
+      `Deleted contact: ${mergeName} (${mergeId})`,
+    ]
+      .filter(Boolean)
+      .join("\n"),
+    isError: false,
+  };
 }
 
 export { executeContactMerge as run };

package/src/config/bundled-skills/contacts/tools/contact-search.ts

@@ -1,30 +1,15 @@
-import {
-  gatewayGet,
-  GatewayRequestError,
-} from "../../../../runtime/gateway-internal-client.js";
+import type { ContactWithChannels } from "../../../../contacts/types.js";
+import { cliIpcCall } from "../../../../ipc/cli-client.js";
+import { resolveGuardianName } from "../../../../prompts/user-reference.js";
 import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
 
-interface ContactChannel {
-  type: string;
-  address: string;
-  isPrimary: boolean;
-  externalUserId?: string | null;
-  externalChatId?: string | null;
-}
-
-interface ContactResponse {
-  id: string;
-  displayName: string;
-  notes: string | null;
-  interactionCount: number;
-  channels: ContactChannel[];
-}
-
-function formatContactSummary(c: ContactResponse): string {
-  const parts = [`- **${c.displayName}** (ID: ${c.id})`];
+function formatContactSummary(c: ContactWithChannels): string {
+  const displayName =
+    c.role === "guardian" ? resolveGuardianName(c.displayName) : c.displayName;
+  const parts = [`- **${displayName}** (ID: ${c.id})`];
   if (c.notes) parts.push(`  Notes: ${c.notes}`);
   if (c.interactionCount > 0)
     parts.push(`  Interactions: ${c.interactionCount}`);
@@ -61,40 +46,32 @@ export async function executeContactSearch(
     };
   }
 
-  try {
-    const params = new URLSearchParams();
-    if (query) params.set("query", query);
-    if (channelAddress) params.set("channelAddress", channelAddress);
-    if (channelType) params.set("channelType", channelType);
-    if (limit !== undefined) params.set("limit", String(limit));
+  const res = await cliIpcCall<ContactWithChannels[]>("search_contacts", {
+    query,
+    channelAddress,
+    channelType,
+    limit,
+  });
 
-    const qs = params.toString();
-    const data = await gatewayGet<{ ok: boolean; contacts: ContactResponse[] }>(
-      `/v1/contacts${qs ? `?${qs}` : ""}`,
-    );
-    const results = data.contacts;
+  if (!res.ok) {
+    return { content: `Error: ${res.error}`, isError: true };
+  }
 
-    if (results.length === 0) {
-      return {
-        content: "No contacts found matching the search criteria.",
-        isError: false,
-      };
-    }
+  const results = res.result ?? [];
 
-    const lines = [`Found ${results.length} contact(s):\n`];
-    for (const contact of results) {
-      lines.push(formatContactSummary(contact));
-    }
+  if (results.length === 0) {
+    return {
+      content: "No contacts found matching the search criteria.",
+      isError: false,
+    };
+  }
 
-    return { content: lines.join("\n"), isError: false };
-  } catch (err) {
-    if (err instanceof GatewayRequestError) {
-      const message = err.gatewayError ?? err.message;
-      return { content: `Error: ${message}`, isError: true };
-    }
-    const msg = err instanceof Error ? err.message : String(err);
-    return { content: `Error: ${msg}`, isError: true };
+  const lines = [`Found ${results.length} contact(s):\n`];
+  for (const contact of results) {
+    lines.push(formatContactSummary(contact));
   }
+
+  return { content: lines.join("\n"), isError: false };
 }
 
 export { executeContactSearch as run };

package/src/config/bundled-skills/contacts/tools/contact-upsert.ts

@@ -1,30 +1,15 @@
-import {
-  gatewayPost,
-  GatewayRequestError,
-} from "../../../../runtime/gateway-internal-client.js";
+import type { ContactWithChannels } from "../../../../contacts/types.js";
+import { cliIpcCall } from "../../../../ipc/cli-client.js";
+import { resolveGuardianName } from "../../../../prompts/user-reference.js";
 import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
 
-interface ContactChannel {
-  type: string;
-  address: string;
-  isPrimary: boolean;
-  externalUserId?: string | null;
-  externalChatId?: string | null;
-}
-
-interface ContactResponse {
-  id: string;
-  displayName: string;
-  notes: string | null;
-  interactionCount: number;
-  channels: ContactChannel[];
-}
-
-function formatContact(c: ContactResponse): string {
-  const lines = [`Contact ${c.id}`, `  Name: ${c.displayName}`];
+function formatContact(c: ContactWithChannels): string {
+  const displayName =
+    c.role === "guardian" ? resolveGuardianName(c.displayName) : c.displayName;
+  const lines = [`Contact ${c.id}`, `  Name: ${displayName}`];
   if (c.notes) lines.push(`  Notes: ${c.notes}`);
   if (c.interactionCount > 0)
     lines.push(`  Interactions: ${c.interactionCount}`);
@@ -71,30 +56,27 @@ export async function executeContactUpsert(
     isPrimary: ch.is_primary,
   }));
 
-  try {
-    const { status, data } = await gatewayPost<{
-      ok: boolean;
-      contact: ContactResponse;
-    }>("/v1/contacts", {
+  const res = await cliIpcCall<ContactWithChannels & { created: boolean }>(
+    "upsert_contact",
+    {
       id: input.id as string | undefined,
       displayName: displayName.trim(),
       notes: input.notes as string | undefined,
       channels,
-    });
-
-    const created = status === 201;
+    },
+  );
 
-    return {
-      content: `${created ? "Created" : "Updated"} contact:\n${formatContact(data.contact)}`,
-      isError: false,
-    };
-  } catch (err) {
-    if (err instanceof GatewayRequestError) {
-      return { content: `Error: ${err.message}`, isError: true };
-    }
-    const msg = err instanceof Error ? err.message : String(err);
-    return { content: `Error: ${msg}`, isError: true };
+  if (!res.ok) {
+    return { content: `Error: ${res.error}`, isError: true };
   }
+
+  const contact = res.result!;
+  const verb = contact.created ? "Created" : "Updated";
+
+  return {
+    content: `${verb} contact:\n${formatContact(contact)}`,
+    isError: false,
+  };
 }
 
 export { executeContactUpsert as run };

package/src/config/bundled-skills/image-studio/SKILL.md

@@ -25,10 +25,11 @@ You are an image generation assistant. When the user asks you to create or edit
 
 - `gemini-3.1-flash-image-preview` (default) - Nano Banana 2, fast, good quality
 - `gemini-3-pro-image-preview` - Nano Banana Pro, higher quality, slower
+- `gpt-image-2` - OpenAI GPT Image 2, high fidelity, slower
 
 ## Tips
 
 - Be descriptive in your prompts for better results. Include details about style, composition, lighting, and mood.
 - When editing images, clearly describe what changes you want made to the source image.
 - Use the `variants` parameter (1-4) to generate multiple options and pick the best one.
-- If no Gemini API key is configured, the tool will return an error - ask the user to set one up.
+- If no API key is configured for the selected model's provider (Gemini or OpenAI), the tool will return an error - ask the user to set one up.

package/src/config/bundled-skills/image-studio/TOOLS.json

@@ -29,7 +29,8 @@
             "type": "string",
             "enum": [
               "gemini-3.1-flash-image-preview",
-              "gemini-3-pro-image-preview"
+              "gemini-3-pro-image-preview",
+              "gpt-image-2"
             ],
             "description": "Which model to use for generation. If omitted, uses the user's configured preference."
           },

package/src/config/bundled-skills/image-studio/tools/media-generate-image.ts

@@ -1,16 +1,12 @@
 import { getConfig } from "../../../../config/loader.js";
+import { resolveImageGenCredentials } from "../../../../media/image-credentials.js";
 import {
   generateImage,
-  type ImageGenCredentials,
-  mapGeminiError,
-} from "../../../../media/gemini-image-service.js";
+  mapImageGenError,
+  providerForModel,
+} from "../../../../media/image-service.js";
 import { getFilePathBySourcePath } from "../../../../memory/attachments-store.js";
-import {
-  buildManagedBaseUrl,
-  resolveManagedProxyContext,
-} from "../../../../providers/managed-proxy/context.js";
 import type { ImageContent } from "../../../../providers/types.js";
-import { getProviderKeyAsync } from "../../../../security/secure-keys.js";
 import { sandboxPolicy } from "../../../../tools/shared/filesystem/path-policy.js";
 import type {
   ToolContext,
@@ -22,42 +18,30 @@ export async function run(
   context: ToolContext,
 ): Promise<ToolExecutionResult> {
   const config = getConfig();
-  const imageGenMode = config.services["image-generation"].mode;
-
-  // Resolve credentials strictly based on mode — no cross-mode fallbacks
-  let credentials: ImageGenCredentials | undefined;
-
-  if (imageGenMode === "managed") {
-    const managedBaseUrl = await buildManagedBaseUrl("gemini");
-    if (managedBaseUrl) {
-      const ctx = await resolveManagedProxyContext();
-      credentials = {
-        type: "managed-proxy",
-        assistantApiKey: ctx.assistantApiKey,
-        baseUrl: managedBaseUrl,
-      };
-    }
-  } else {
-    const apiKey = await getProviderKeyAsync("gemini");
-    if (apiKey) {
-      credentials = { type: "direct", apiKey };
-    }
-  }
-
+  const svc = config.services["image-generation"];
+  const modelOverride = input.model;
+  // Derive provider from the explicit model when supplied so that requesting
+  // e.g. `gpt-image-2` while config.provider === "gemini" routes to OpenAI
+  // instead of silently falling back to the Gemini default model.
+  const provider = providerForModel(modelOverride, svc.provider);
+  const { credentials, errorHint } = await resolveImageGenCredentials({
+    provider,
+    mode: svc.mode,
+  });
   if (!credentials) {
-    const hint =
-      imageGenMode === "managed"
-        ? "Managed proxy is not available. Please log in to Vellum or switch to Your Own mode."
-        : "No Gemini API key configured. Please set your Gemini API key in Settings > Models & Services.";
-    return { content: hint, isError: true };
+    return {
+      content: errorHint ?? "Image generation is not configured.",
+      isError: true,
+    };
   }
 
   const prompt = input.prompt as string;
   const mode = (input.mode as "generate" | "edit") ?? "generate";
   const sourcePaths = input.source_paths as string[] | undefined;
   const model =
-    (input.model as string | undefined) ??
-    config.services["image-generation"].model;
+    typeof modelOverride === "string" && modelOverride
+      ? modelOverride
+      : config.services["image-generation"].model;
   const variants = input.variants as number | undefined;
 
   // Resolve source images from file paths (sandboxed to workingDir, edit mode only)
@@ -111,7 +95,7 @@ export async function run(
   }
 
   try {
-    const result = await generateImage(credentials, {
+    const result = await generateImage(provider, credentials, {
       prompt,
       mode,
       sourceImages,
@@ -147,7 +131,7 @@ export async function run(
     };
   } catch (error) {
     return {
-      content: mapGeminiError(error),
+      content: mapImageGenError(provider, error),
       isError: true,
     };
   }

package/src/config/bundled-skills/messaging/SKILL.md

@@ -145,10 +145,10 @@ Telegram is supported as a messaging provider with limited capabilities compared
 
 ## Notifications vs Messages
 
-- `send_notification` is provided by the **notifications** skill (always active) -- use it when the user asks for an alert/notification (for example "send this as a desktop notification").
+- Notifications are sent via the **notifications** skill (always active) using `assistant notifications send` in `bash` -- use it when the user asks for an alert/notification (for example "send this as a desktop notification").
 - Use `messaging_send` when the user asks to send a message into a specific chat/email destination.
-- `send_notification` channel routing is LLM-driven; `preferred_channels` are hints, not hard channel forcing.
-- Before using `messaging_send` or `send_notification`, look up the recipient's contact record with `contact_search` to inform tone and content (see **Recipient Context** below).
+- Notification channel routing is LLM-driven; `--preferred-channels` are hints, not hard channel forcing.
+- Before using `messaging_send` or sending a notification, look up the recipient's contact record with `contact_search` to inform tone and content (see **Recipient Context** below).
 
 ## Personalized Drafting