@vellumai/assistant 0.6.5 → 0.6.6

package/src/cli/commands/clients.ts

@@ -0,0 +1,138 @@
+import type { Command } from "commander";
+
+import { cliIpcCall } from "../../ipc/cli-client.js";
+import type { ClientEntryJSON } from "../../runtime/client-registry.js";
+import { log } from "../logger.js";
+import { writeOutput } from "../output.js";
+
+interface ListClientsResponse {
+  clients: ClientEntryJSON[];
+}
+
+export function registerClientsCommand(program: Command): void {
+  const clients = program
+    .command("clients")
+    .description("Discover connected clients and their capabilities");
+
+  clients.addHelpText(
+    "after",
+    `
+Clients are the applications currently connected to the assistant —
+macOS desktop, iOS, web, Chrome extension, or CLI. Each client has a
+set of capabilities (e.g. host_bash, host_file) that determine which
+tools the assistant can route through it.
+
+Examples:
+  $ assistant clients list                       List all connected clients
+  $ assistant clients list --json                Machine-readable JSON output
+  $ assistant clients list --capability host_bash  Show only clients that can run host commands`,
+  );
+
+  clients
+    .command("list")
+    .description("List all currently connected clients")
+    .option("--json", "Machine-readable compact JSON output")
+    .option(
+      "--capability <name>",
+      "Filter to clients supporting this capability (e.g. host_bash, host_file, host_cu, host_browser)",
+    )
+    .addHelpText(
+      "after",
+      `
+Options:
+  --json                Output as compact JSON instead of a table.
+  --capability <name>   Only show clients that support the named capability.
+                        Valid values: host_bash, host_file, host_cu, host_browser.
+
+The table shows each client's ID, interface type, capabilities,
+connection timestamps, and host environment (when available).
+Clients are sorted by most recently active first.
+
+Examples:
+  $ assistant clients list
+  $ assistant clients list --capability host_bash
+  $ assistant clients list --json | jq '.clients[0].capabilities'`,
+    )
+    .action(
+      async (opts: { json?: boolean; capability?: string }, cmd: Command) => {
+        const params: Record<string, unknown> = {};
+        if (opts.capability) {
+          params.capability = opts.capability;
+        }
+
+        const result = await cliIpcCall<ListClientsResponse>(
+          "list_clients",
+          Object.keys(params).length > 0 ? params : undefined,
+        );
+
+        if (!result.ok) {
+          log.error(result.error ?? "Failed to list clients");
+          process.exitCode = 1;
+          return;
+        }
+
+        const response = result.result!;
+        const { clients: entries } = response;
+
+        if (opts.json) {
+          writeOutput(cmd, response);
+          return;
+        }
+
+        if (entries.length === 0) {
+          log.info("No clients connected.");
+          return;
+        }
+
+        // Table output
+        const header = [
+          "CLIENT ID",
+          "INTERFACE",
+          "CAPABILITIES",
+          "CONNECTED",
+          "LAST ACTIVE",
+          "HOST",
+        ];
+        const rows: string[][] = entries.map((e: ClientEntryJSON) => [
+          e.clientId.length > 20 ? `${e.clientId.slice(0, 17)}...` : e.clientId,
+          e.interfaceId,
+          e.capabilities.length > 0 ? e.capabilities.join(", ") : "—",
+          formatRelativeTime(e.connectedAt),
+          formatRelativeTime(e.lastActiveAt),
+          e.hostUsername
+            ? `${e.hostUsername}${e.hostHomeDir ? ` (${e.hostHomeDir})` : ""}`
+            : "—",
+        ]);
+
+        // Calculate column widths
+        const colWidths = header.map((h: string, i: number) =>
+          Math.max(h.length, ...rows.map((r: string[]) => r[i].length)),
+        );
+
+        const pad = (s: string, w: number) => s.padEnd(w);
+        const line = header
+          .map((h: string, i: number) => pad(h, colWidths[i]))
+          .join("  ");
+        log.info(line);
+        log.info(colWidths.map((w: number) => "─".repeat(w)).join("  "));
+        for (const row of rows) {
+          log.info(
+            row.map((c: string, i: number) => pad(c, colWidths[i])).join("  "),
+          );
+        }
+      },
+    );
+}
+
+function formatRelativeTime(iso: string): string {
+  const ms = Date.now() - new Date(iso).getTime();
+  if (ms < 0) return "just now";
+  const sec = Math.floor(ms / 1000);
+  if (sec < 60) return `${sec}s ago`;
+  const min = Math.floor(sec / 60);
+  if (min < 60) return `${min}m ago`;
+  const hr = Math.floor(min / 60);
+  if (hr < 24) return `${hr}h ago`;
+  const days = Math.floor(hr / 24);
+  return `${days}d ago`;
+}

package/src/cli/commands/completions.ts

@@ -40,7 +40,6 @@ Examples:
         keys: ["list", "set", "delete"],
         trust: ["list", "remove", "clear"],
         memory: ["status", "backfill", "cleanup", "query", "rebuild-index"],
-        hooks: ["list", "enable", "disable", "install", "remove"],
         contacts: ["list", "invites", "get", "merge"],
         autonomy: ["get", "set"],
       };
@@ -50,7 +49,6 @@ Examples:
         "keys",
         "trust",
         "memory",
-        "hooks",
         "contacts",
         "autonomy",
         "audit",
@@ -63,7 +61,7 @@ Examples:
           process.stdout.write(generateBashCompletion(topLevel, subcommands));
           break;
         case "zsh":
-          process.stdout.write(generateZshCompletion(topLevel, subcommands));
+          process.stdout.write(generateZshCompletion(subcommands));
           break;
         case "fish":
           process.stdout.write(generateFishCompletion(topLevel, subcommands));
@@ -113,10 +111,7 @@ complete -F _assistant_completions assistant
 `;
 }
 
-function generateZshCompletion(
-  topLevel: string[],
-  subcommands: Record<string, string[]>,
-): string {
+function generateZshCompletion(subcommands: Record<string, string[]>): string {
   const subcmdCases = Object.entries(subcommands)
     .map(([cmd, subs]) => `        ${cmd}) compadd ${subs.join(" ")} ;;`)
     .join("\n");
@@ -132,7 +127,6 @@ _assistant() {
         'keys:Manage API keys in secure storage'
         'trust:Manage trust rules'
         'memory:Manage long-term memory'
-        'hooks:Manage hooks'
         'contacts:Manage the contact graph'
         'autonomy:View and configure autonomy tiers'
         'audit:Show recent tool invocations'
@@ -172,7 +166,6 @@ function generateFishCompletion(
     keys: "Manage API keys in secure storage",
     trust: "Manage trust rules",
     memory: "Manage long-term memory",
-    hooks: "Manage hooks",
     contacts: "Manage the contact graph",
     autonomy: "View and configure autonomy tiers",
     audit: "Show recent tool invocations",

package/src/cli/commands/conversations.ts

@@ -1,10 +1,6 @@
 import type { Command } from "commander";
 
-import {
-  getQdrantUrlEnv,
-  getRuntimeHttpHost,
-  getRuntimeHttpPort,
-} from "../../config/env.js";
+import { getRuntimeHttpHost, getRuntimeHttpPort } from "../../config/env.js";
 import { getConfig } from "../../config/loader.js";
 import { shouldAutoStartDaemon } from "../../daemon/connection-policy.js";
 import { healthCheckHost, isHttpHealthy } from "../../daemon/daemon-control.js";
@@ -25,7 +21,10 @@ import {
   SPARSE_EMBEDDING_VERSION,
 } from "../../memory/embedding-backend.js";
 import { enqueueMemoryJob } from "../../memory/jobs-store.js";
-import { initQdrantClient } from "../../memory/qdrant-client.js";
+import {
+  initQdrantClient,
+  resolveQdrantUrl,
+} from "../../memory/qdrant-client.js";
 import {
   initAuthSigningKey,
   loadOrCreateSigningKey,
@@ -113,6 +112,55 @@ Examples:
       );
     });
 
+  conversations
+    .command("rename <conversationId> <title>")
+    .description("Rename a conversation")
+    .addHelpText(
+      "after",
+      `
+Arguments:
+  conversationId   Conversation ID (or unique prefix). Supports prefix matching.
+                   Run 'assistant conversations list' to find IDs.
+  title            The new title for the conversation. Should be concise (under
+                   60 characters) and descriptive of the current topic.
+
+Renames the conversation to the given title and marks it as a manual rename
+(auto-generated titles will not overwrite it).
+
+Examples:
+  $ assistant conversations rename abc123 "Project planning"
+  $ assistant conversations rename abc123 "Bug triage 2026-04-22"`,
+    )
+    .action(async (conversationId: string, title: string) => {
+      const trimmedTitle = title.trim();
+      if (!trimmedTitle) {
+        log.error("Error: title must be a non-empty string");
+        process.exit(1);
+      }
+
+      const ipcResult = await cliIpcCall<{ ok: boolean; error?: string }>(
+        "rename_conversation",
+        { conversationId, title: trimmedTitle },
+      );
+
+      if (!ipcResult.ok) {
+        log.error(
+          `Rename failed: ${ipcResult.error}. Run 'assistant conversations list' to verify the conversation exists.`,
+        );
+        process.exit(1);
+      }
+
+      const result = ipcResult.result!;
+      if (!result.ok) {
+        log.error(
+          `Rename failed: ${result.error}. Run 'assistant conversations list' to see available conversations.`,
+        );
+        process.exit(1);
+      }
+
+      log.info(`Renamed conversation to "${trimmedTitle}" (${conversationId})`);
+    });
+
   conversations
     .command("export [conversationId]")
     .description("Export a conversation as markdown or JSON")
@@ -247,7 +295,7 @@ Examples:
       );
 
       const config = getConfig();
-      const qdrantUrl = getQdrantUrlEnv() || config.memory.qdrant.url;
+      const qdrantUrl = resolveQdrantUrl(config);
       const embeddingSelection = await selectEmbeddingBackend(config);
       const embeddingModel = embeddingSelection.backend
         ? `${embeddingSelection.backend.provider}:${embeddingSelection.backend.model}:sparse-v${SPARSE_EMBEDDING_VERSION}`

package/src/cli/commands/image-generation.ts

@@ -5,16 +5,13 @@ import { join } from "node:path";
 import { Command } from "commander";
 
 import { getConfig } from "../../config/loader.js";
+import { resolveImageGenCredentials } from "../../media/image-credentials.js";
 import {
   generateImage,
   type ImageGenCredentials,
-  mapGeminiError,
-} from "../../media/gemini-image-service.js";
-import {
-  buildManagedBaseUrl,
-  resolveManagedProxyContext,
-} from "../../providers/managed-proxy/context.js";
-import { getProviderKeyAsync } from "../../security/secure-keys.js";
+  mapImageGenError,
+  providerForModel,
+} from "../../media/image-service.js";
 import { log } from "../logger.js";
 
 // ---------------------------------------------------------------------------
@@ -72,11 +69,12 @@ export function registerImageGenerationCommand(program: Command): void {
     `
 Modes:
   managed    — Uses platform-managed credentials (requires login to Vellum).
-  your-own   — Uses your own Gemini API key configured in settings.
+  your-own   — Uses your own Gemini or OpenAI API key depending on the configured model.
 
 Supported models:
   gemini-3.1-flash-image-preview (default)
   gemini-3-pro-image-preview
+  gpt-image-2
 
 Examples:
   $ assistant image-generation generate --prompt "A sunset over the ocean"
@@ -114,12 +112,14 @@ Notes:
   Edit mode (--mode edit) requires at least one --source image file.
   Output files are named image-1.png, image-2.png, etc. (extension matches MIME type).
   Default output directory is the system temp directory.
+  Uses your own Gemini or OpenAI API key depending on the configured model.
 
 Examples:
   $ assistant image-generation generate --prompt "A mountain landscape at dawn"
   $ assistant image-generation generate --prompt "Make it darker" --mode edit --source input.png
   $ assistant image-generation generate --prompt "Logo variations" --variants 4 --output-dir ./logos
-  $ assistant image-generation generate --prompt "A robot" --model gemini-3-pro-image-preview --json`,
+  $ assistant image-generation generate --prompt "A robot" --model gemini-3-pro-image-preview --json
+  $ assistant image-generation generate --prompt "A robot" --model gpt-image-2 --json`,
   );
 
   generate.action(async (opts) => {
@@ -149,33 +149,30 @@ Examples:
 
     // --- Resolve credentials ---
     const config = getConfig();
-    const imageGenMode = config.services["image-generation"].mode;
+    const svc = config.services["image-generation"];
 
-    let credentials: ImageGenCredentials | undefined;
+    // Derive provider from the explicit `--model` override when supplied so
+    // that `--model gpt-image-2` routes to OpenAI even when config.provider
+    // is `gemini` (and vice-versa). Without this, the Gemini service would
+    // silently downgrade unknown models to its default.
+    const provider = providerForModel(modelOverride, svc.provider);
 
-    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 { credentials, errorHint } = await resolveImageGenCredentials({
+      provider,
+      mode: svc.mode,
+    });
 
     if (!credentials) {
+      const baseHint =
+        errorHint ?? "No credentials available for image generation.";
+      // The shared hint in image-credentials.ts is UI-neutral (it points at
+      // "Settings > Models & Services"), which is correct for tool surfaces
+      // but drops the actionable CLI command. Prepend the exact command for
+      // each mode so CLI users see a next-step they can copy-paste.
       const hint =
-        imageGenMode === "managed"
-          ? "Managed proxy is not available. Please log in to Vellum or switch to your-own mode:\n  Run 'assistant auth login' to authenticate, or set services.image-generation.mode to 'your-own' in config."
-          : "No Gemini API key configured. Add your Gemini API key:\n  Run 'assistant keys set gemini' or configure it in Settings > Models & Services.";
-
+        svc.mode === "managed"
+          ? `${baseHint}\n  Run 'assistant auth login' to authenticate, or set services.image-generation.mode to 'your-own' in config.`
+          : `Run: assistant keys set ${provider} <key>.\n${baseHint}`;
       if (jsonOutput) {
         process.stdout.write(JSON.stringify({ ok: false, error: hint }) + "\n");
       } else {
@@ -185,6 +182,8 @@ Examples:
       return;
     }
 
+    const resolvedCredentials: ImageGenCredentials = credentials;
+
     // --- Read source images for edit mode ---
     let sourceImages:
       | Array<{ mimeType: string; dataBase64: string }>
@@ -231,11 +230,11 @@ Examples:
     }
 
     // --- Resolve model ---
-    const model = modelOverride ?? config.services["image-generation"].model;
+    const model = modelOverride ?? svc.model;
 
     // --- Generate image ---
     try {
-      const result = await generateImage(credentials, {
+      const result = await generateImage(provider, resolvedCredentials, {
         prompt,
         mode,
         sourceImages,
@@ -286,7 +285,7 @@ Examples:
         }
       }
     } catch (error) {
-      const errorMsg = mapGeminiError(error);
+      const errorMsg = mapImageGenError(provider, error);
       if (jsonOutput) {
         process.stdout.write(
           JSON.stringify({ ok: false, error: errorMsg }) + "\n",

package/src/cli/commands/notifications.ts

@@ -1,41 +1,9 @@
 import type { Command } from "commander";
 
-import { getDeliverableChannels } from "../../channels/config.js";
-import { emitNotificationSignal } from "../../notifications/emit-signal.js";
-import { listEvents } from "../../notifications/events-store.js";
-import {
-  isNotificationSourceChannel,
-  isNotificationSourceEventName,
-  NOTIFICATION_SOURCE_CHANNELS,
-  NOTIFICATION_SOURCE_EVENT_NAMES,
-} from "../../notifications/signal.js";
-import type { NotificationChannel } from "../../notifications/types.js";
-import {
-  initAuthSigningKey,
-  resolveSigningKey,
-} from "../../runtime/auth/token-service.js";
-import { initializeDb } from "../db.js";
+import { cliIpcCall } from "../../ipc/cli-client.js";
 import { log } from "../logger.js";
 import { shouldOutputJson, writeOutput } from "../output.js";
 
-// ---------------------------------------------------------------------------
-// Help text builders
-// ---------------------------------------------------------------------------
-
-function buildSourceChannelsHelpBlock(): string {
-  const lines = NOTIFICATION_SOURCE_CHANNELS.map(
-    (c) => `  ${c.id.padEnd(20)} ${c.description}`,
-  );
-  return `\nSource channels:\n${lines.join("\n")}`;
-}
-
-function buildSourceEventNamesHelpBlock(): string {
-  const lines = NOTIFICATION_SOURCE_EVENT_NAMES.map(
-    (e) => `  ${e.id.padEnd(50)} ${e.description}`,
-  );
-  return `\nSource event names:\n${lines.join("\n")}`;
-}
-
 // ---------------------------------------------------------------------------
 // Command registration
 // ---------------------------------------------------------------------------
@@ -55,8 +23,6 @@ Notifications flow through a unified pipeline: a signal is emitted with a
 source channel, event name, and attention hints. The decision engine evaluates
 whether and where to deliver the notification based on connected channels,
 urgency, and user preferences.
-${buildSourceChannelsHelpBlock()}
-${buildSourceEventNamesHelpBlock()}
 
 Examples:
   $ assistant notifications send --source-channel assistant_tool --source-event-name user.send_notification --message "Build finished"
@@ -129,6 +95,10 @@ Examples:
       "--dedupe-key <key>",
       "Optional dedupe key to suppress duplicate notifications",
     )
+    .option(
+      "--deep-link-metadata <json>",
+      "Optional JSON metadata clients can use for deep linking",
+    )
     .addHelpText(
       "after",
       `
@@ -165,37 +135,12 @@ Examples:
           preferredChannels?: string;
           sessionId?: string;
           dedupeKey?: string;
+          deepLinkMetadata?: string;
         },
         cmd: Command,
       ) => {
         try {
-          // Validate --source-channel
-          if (!isNotificationSourceChannel(opts.sourceChannel)) {
-            const validChannels = NOTIFICATION_SOURCE_CHANNELS.map(
-              (c) => c.id,
-            ).join(", ");
-            writeOutput(cmd, {
-              ok: false,
-              error: `Invalid source channel "${opts.sourceChannel}". Valid values: ${validChannels}`,
-            });
-            process.exitCode = 1;
-            return;
-          }
-
-          // Validate --source-event-name
-          if (!isNotificationSourceEventName(opts.sourceEventName)) {
-            const validEvents = NOTIFICATION_SOURCE_EVENT_NAMES.map(
-              (e) => e.id,
-            ).join(", ");
-            writeOutput(cmd, {
-              ok: false,
-              error: `Invalid source event name "${opts.sourceEventName}". Valid values: ${validEvents}`,
-            });
-            process.exitCode = 1;
-            return;
-          }
-
-          // Validate --message
+          // Validate --message (keep basic validation for immediate CLI feedback)
           const message = opts.message.trim();
           if (message.length === 0) {
             writeOutput(cmd, {
@@ -217,7 +162,7 @@ Examples:
             return;
           }
 
-          // Validate --deadline-at
+          // Parse --deadline-at
           let deadlineAt: number | undefined;
           if (opts.deadlineAt != null) {
             const parsed = Number(opts.deadlineAt);
@@ -232,36 +177,43 @@ Examples:
             deadlineAt = parsed;
           }
 
-          // Validate --preferred-channels
-          let preferredChannels: NotificationChannel[] | undefined;
+          // Parse --preferred-channels
+          let preferredChannels: string[] | undefined;
           if (opts.preferredChannels) {
-            const deliverable = getDeliverableChannels();
-            const requested = opts.preferredChannels
+            preferredChannels = opts.preferredChannels
               .split(",")
               .map((ch) => ch.trim())
               .filter((ch) => ch.length > 0);
+          }
 
-            for (const ch of requested) {
-              if (!deliverable.includes(ch as NotificationChannel)) {
-                writeOutput(cmd, {
-                  ok: false,
-                  error: `Invalid preferred channel "${ch}". Valid deliverable channels: ${deliverable.join(", ")}`,
-                });
-                process.exitCode = 1;
-                return;
-              }
+          // Parse --deep-link-metadata
+          let deepLinkMetadata: Record<string, unknown> | undefined;
+          if (opts.deepLinkMetadata != null) {
+            try {
+              deepLinkMetadata = JSON.parse(opts.deepLinkMetadata) as Record<
+                string,
+                unknown
+              >;
+            } catch {
+              writeOutput(cmd, {
+                ok: false,
+                error: `Invalid deep-link-metadata: must be a valid JSON string`,
+              });
+              process.exitCode = 1;
+              return;
             }
-            preferredChannels = requested as NotificationChannel[];
           }
 
-          initializeDb();
-          initAuthSigningKey(resolveSigningKey());
-
           const sourceContextId = opts.sessionId ?? `cli-${Date.now()}`;
 
-          const result = await emitNotificationSignal({
-            sourceEventName: opts.sourceEventName,
+          const result = await cliIpcCall<{
+            signalId: string;
+            dispatched: boolean;
+            deduplicated: boolean;
+            reason: string;
+          }>("emit_notification_signal", {
             sourceChannel: opts.sourceChannel,
+            sourceEventName: opts.sourceEventName,
             sourceContextId,
             attentionHints: {
               requiresAction: opts.requiresAction ?? true,
@@ -275,24 +227,33 @@ Examples:
               requestedBySource: opts.sourceChannel,
               ...(opts.title ? { requestedTitle: opts.title } : {}),
               ...(preferredChannels?.length ? { preferredChannels } : {}),
+              ...(deepLinkMetadata ? { deepLinkMetadata } : {}),
             },
             ...(opts.dedupeKey ? { dedupeKey: opts.dedupeKey } : {}),
             throwOnError: true,
           });
 
+          if (!result.ok) {
+            writeOutput(cmd, { ok: false, error: result.error });
+            process.exitCode = 1;
+            return;
+          }
+
+          const signal = result.result!;
+
           writeOutput(cmd, {
             ok: true,
-            signalId: result.signalId,
-            dispatched: result.dispatched,
-            reason: result.reason,
+            signalId: signal.signalId,
+            dispatched: signal.dispatched,
+            reason: signal.reason,
           });
 
           if (!shouldOutputJson(cmd)) {
             log.info(
-              `Signal ${result.signalId} emitted (dispatched: ${result.dispatched})`,
+              `Signal ${signal.signalId} emitted (dispatched: ${signal.dispatched})`,
             );
-            if (result.reason) {
-              log.info(`  Reason: ${result.reason}`);
+            if (signal.reason) {
+              log.info(`  Reason: ${signal.reason}`);
             }
           }
         } catch (err) {
@@ -318,7 +279,6 @@ Examples:
 Reads from the local notification events store, ordered by creation time
 (newest first). Each event represents a signal that was emitted through the
 notification pipeline.
-${buildSourceEventNamesHelpBlock()}
 
 Examples:
   $ assistant notifications list
@@ -327,7 +287,7 @@ Examples:
   $ assistant notifications list --source-event-name schedule.notify --limit 10 --json`,
     )
     .action(
-      (
+      async (
         opts: {
           limit?: string;
           sourceEventName?: string;
@@ -368,23 +328,28 @@ Examples:
             limit = parsed;
           }
 
-          initializeDb();
-
-          const rows = listEvents({
+          const result = await cliIpcCall<
+            Array<{
+              id: string;
+              sourceEventName: string;
+              sourceChannel: string;
+              sourceContextId: string;
+              urgency: string;
+              dedupeKey: string | null;
+              createdAt: string;
+            }>
+          >("list_notification_events", {
             limit,
             sourceEventName: opts.sourceEventName,
           });
 
-          const events = rows.map((row) => ({
-            id: row.id,
-            sourceEventName: row.sourceEventName,
-            sourceChannel: row.sourceChannel,
-            sourceContextId: row.sourceContextId,
-            urgency: (JSON.parse(row.attentionHintsJson) as { urgency: string })
-              .urgency,
-            dedupeKey: row.dedupeKey,
-            createdAt: new Date(row.createdAt).toISOString(),
-          }));
+          if (!result.ok) {
+            writeOutput(cmd, { ok: false, error: result.error });
+            process.exitCode = 1;
+            return;
+          }
+
+          const events = result.result!;
 
           writeOutput(cmd, { ok: true, events });