@vellumai/assistant 0.4.54 → 0.4.56

package/src/calls/voice-session-bridge.ts

@@ -1,8 +1,8 @@
 /**
- * Bridge between voice relay and the daemon session pipeline.
+ * Bridge between voice relay and the daemon conversation pipeline.
  *
  * Provides a `startVoiceTurn()` function that manages a voice turn
- * directly through the session, translating agent-loop events into
+ * directly through the conversation, translating agent-loop events into
  * simple callbacks suitable for real-time TTS streaming.
  *
  * Dependency injection follows the same module-level setter pattern used by
@@ -13,10 +13,10 @@
 import { consumeGrantForInvocation } from "../approvals/approval-primitive.js";
 import type { ChannelId } from "../channels/types.js";
 import { getConfig } from "../config/loader.js";
+import type { Conversation } from "../daemon/conversation.js";
+import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
+import { resolveChannelCapabilities } from "../daemon/conversation-runtime-assembly.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
-import type { Session } from "../daemon/session.js";
-import type { TrustContext } from "../daemon/session-runtime-assembly.js";
-import { resolveChannelCapabilities } from "../daemon/session-runtime-assembly.js";
 import { buildAssistantEvent } from "../runtime/assistant-event.js";
 import { assistantEventHub } from "../runtime/assistant-event-hub.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
@@ -36,14 +36,14 @@ const log = getLogger("voice-session-bridge");
 // ---------------------------------------------------------------------------
 
 export interface VoiceBridgeDeps {
-  getOrCreateSession: (
+  getOrCreateConversation: (
     conversationId: string,
     transport?: {
       channelId: ChannelId;
       hints?: string[];
       uxBrief?: string;
     },
-  ) => Promise<Session>;
+  ) => Promise<Conversation>;
   resolveAttachments: (attachmentIds: string[]) => Array<{
     id: string;
     filename: string;
@@ -220,9 +220,9 @@ function buildVoiceCallControlPrompt(opts: {
 // ---------------------------------------------------------------------------
 
 /**
- * Execute a single voice turn through the daemon session pipeline.
+ * Execute a single voice turn through the daemon conversation pipeline.
  *
- * Manages the session directly with voice-specific defaults:
+ * Manages the conversation directly with voice-specific defaults:
  *   - sourceChannel: 'phone'
  *   - event sink wired to the provided callbacks
  *   - abort propagated from the returned handle
@@ -267,7 +267,7 @@ export async function startVoiceTurn(
   const forceStrictSideEffects = isGuardian ? undefined : true;
 
   // Replace the [CALL_OPENING] marker with a neutral instruction before
-  // persisting. The marker must not appear as a user message in session
+  // persisting. The marker must not appear as a user message in conversation
   // history — after a barge-in interruption the next turn would replay
   // the stale marker and potentially retrigger opener behavior.
   const persistedContent =
@@ -287,57 +287,60 @@ export async function startVoiceTurn(
     isCallerGuardian,
   });
 
-  // Get or create the session
+  // Get or create the conversation
   const transport = {
     channelId: "phone" as ChannelId,
   };
-  const session = await deps.getOrCreateSession(opts.conversationId, transport);
+  const conversation = await deps.getOrCreateConversation(
+    opts.conversationId,
+    transport,
+  );
 
-  if (session.isProcessing()) {
+  if (conversation.isProcessing()) {
     // Voice barge-in can race with turn teardown. Wait briefly for the
     // previous turn to finish aborting before giving up.
     const maxWaitMs = 3000;
     const pollIntervalMs = 50;
     let waited = 0;
-    while (session.isProcessing() && waited < maxWaitMs) {
+    while (conversation.isProcessing() && waited < maxWaitMs) {
       if (opts.signal?.aborted) {
-        throw new Error("Turn aborted while waiting for session");
+        throw new Error("Turn aborted while waiting for conversation");
       }
       await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
       waited += pollIntervalMs;
     }
     if (opts.signal?.aborted) {
-      throw new Error("Turn aborted while waiting for session");
+      throw new Error("Turn aborted while waiting for conversation");
     }
-    if (session.isProcessing()) {
-      throw new Error("Session is already processing a message");
+    if (conversation.isProcessing()) {
+      throw new Error("Conversation is already processing a message");
     }
   }
 
-  // Configure session for this voice turn
+  // Configure conversation for this voice turn
   const strictSideEffects =
     forceStrictSideEffects ??
     deps.deriveDefaultStrictSideEffects(opts.conversationId);
-  session.memoryPolicy = {
-    ...session.memoryPolicy,
+  conversation.memoryPolicy = {
+    ...conversation.memoryPolicy,
     strictSideEffects,
   };
-  session.setAssistantId(opts.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID);
-  session.callSessionId = opts.callSessionId;
-  session.setTrustContext(opts.trustContext ?? null);
-  session.setCommandIntent(null);
-  session.setTurnChannelContext({
+  conversation.setAssistantId(opts.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID);
+  conversation.callSessionId = opts.callSessionId;
+  conversation.setTrustContext(opts.trustContext ?? null);
+  conversation.setCommandIntent(null);
+  conversation.setTurnChannelContext({
     userMessageChannel: "phone",
     assistantMessageChannel: "phone",
   });
-  session.setChannelCapabilities(
+  conversation.setChannelCapabilities(
     resolveChannelCapabilities("phone", undefined),
   );
-  session.setVoiceCallControlPrompt(voiceCallControlPrompt);
+  conversation.setVoiceCallControlPrompt(voiceCallControlPrompt);
 
   const requestId = crypto.randomUUID();
   const turnId = crypto.randomUUID();
-  const messageId = await session.persistUserMessage(
+  const messageId = await conversation.persistUserMessage(
     persistedContent,
     [],
     requestId,
@@ -346,17 +349,17 @@ export async function startVoiceTurn(
   // Serialized publish chain so hub subscribers observe events in order.
   let hubChain: Promise<void> = Promise.resolve();
   const publishToHub = (msg: ServerMessage): void => {
-    // ServerMessage is a large union; sessionId exists on most but not all variants.
-    const msgSessionId =
-      "sessionId" in msg &&
-      typeof (msg as { sessionId?: unknown }).sessionId === "string"
-        ? (msg as { sessionId: string }).sessionId
+    // ServerMessage is a large union; conversationId exists on most but not all variants.
+    const msgConversationId =
+      "conversationId" in msg &&
+      typeof (msg as { conversationId?: unknown }).conversationId === "string"
+        ? (msg as { conversationId: string }).conversationId
         : undefined;
-    const resolvedSessionId = msgSessionId ?? opts.conversationId;
+    const resolvedConversationId = msgConversationId ?? opts.conversationId;
     const event = buildAssistantEvent(
       DAEMON_INTERNAL_ASSISTANT_ID,
       msg,
-      resolvedSessionId,
+      resolvedConversationId,
     );
     hubChain = (async () => {
       await hubChain;
@@ -371,12 +374,12 @@ export async function startVoiceTurn(
     })();
   };
 
-  // Hook into session to intercept confirmation_request and secret_request events.
+  // Hook into conversation to intercept confirmation_request and secret_request events.
   // Voice auto-denies/auto-allows/auto-resolves these since there's no interactive UI.
   const autoDeny = !isGuardian;
   const autoAllow = isGuardian;
   let lastError: string | null = null;
-  session.updateClient(async (msg: ServerMessage) => {
+  conversation.updateClient(async (msg: ServerMessage) => {
     if (msg.type === "confirmation_request") {
       if (autoDeny) {
         // Non-guardian voice callers have no interactive approval UI.
@@ -416,7 +419,7 @@ export async function startVoiceTurn(
               },
               "Consumed scoped grant — allowing non-guardian voice confirmation",
             );
-            session.handleConfirmationResponse(
+            conversation.handleConfirmationResponse(
               msg.requestId,
               "allow",
               undefined,
@@ -437,7 +440,7 @@ export async function startVoiceTurn(
           { turnId, toolName: msg.toolName },
           "Auto-denying confirmation request for non-guardian voice turn (no matching scoped grant)",
         );
-        session.handleConfirmationResponse(
+        conversation.handleConfirmationResponse(
           msg.requestId,
           "deny",
           undefined,
@@ -452,7 +455,7 @@ export async function startVoiceTurn(
           { turnId, toolName: msg.toolName },
           "Auto-approving confirmation request for guardian voice turn",
         );
-        session.handleConfirmationResponse(
+        conversation.handleConfirmationResponse(
           msg.requestId,
           "allow",
           undefined,
@@ -468,7 +471,7 @@ export async function startVoiceTurn(
         { turnId, service: msg.service, field: msg.field },
         "Auto-resolving secret request for voice turn (no secret-entry UI)",
       );
-      session.handleSecretResponse(msg.requestId, undefined, "store");
+      conversation.handleSecretResponse(msg.requestId, undefined, "store");
       publishToHub(msg);
       return;
     }
@@ -479,26 +482,26 @@ export async function startVoiceTurn(
   const cleanup = () => {
     // Reset channel capabilities so a subsequent desktop session on the
     // same conversation is not incorrectly treated as a voice client.
-    session.setChannelCapabilities(null);
-    session.setTrustContext(null);
-    session.setCommandIntent(null);
-    session.setAssistantId("self");
-    session.setVoiceCallControlPrompt(null);
-    session.callSessionId = undefined;
-    // Reset the session's client callback to a no-op so the stale
-    // closure doesn't intercept events from future turns on the same session.
-    session.updateClient(() => {}, true);
+    conversation.setChannelCapabilities(null);
+    conversation.setTrustContext(null);
+    conversation.setCommandIntent(null);
+    conversation.setAssistantId("self");
+    conversation.setVoiceCallControlPrompt(null);
+    conversation.callSessionId = undefined;
+    // Reset the conversation's client callback to a no-op so the stale
+    // closure doesn't intercept events from future turns on the same conversation.
+    conversation.updateClient(() => {}, true);
   };
 
   void (async () => {
     try {
-      await session.runAgentLoop(
+      await conversation.runAgentLoop(
         persistedContent,
         messageId,
         (msg: ServerMessage) => {
           if (msg.type === "error") {
             lastError = msg.message;
-          } else if (msg.type === "session_error") {
+          } else if (msg.type === "conversation_error") {
             lastError = msg.userMessage;
           }
           publishToHub(msg);
@@ -514,7 +517,7 @@ export async function startVoiceTurn(
             eventSink.onMessageComplete();
           } else if (msg.type === "error") {
             eventSink.onError(msg.message);
-          } else if (msg.type === "session_error") {
+          } else if (msg.type === "conversation_error") {
             eventSink.onError(msg.userMessage);
           } else if (msg.type === "tool_use_start") {
             eventSink.onToolUse(msg.toolName, msg.input);
@@ -539,8 +542,8 @@ export async function startVoiceTurn(
   })();
 
   const abortFn = () => {
-    if (session.currentRequestId === requestId) {
-      session.abort();
+    if (conversation.currentRequestId === requestId) {
+      conversation.abort();
     }
   };
 

package/src/cli/AGENTS.md

@@ -2,7 +2,7 @@
 
 ## Purpose
 
-Commands in `assistant/src/cli/` are scoped to a **single running assistant instance**. They operate on the assistant's local state — config, memory, contacts, trust rules, sessions, autonomy, etc. — and run within the context of the assistant's workspace.
+Commands in `assistant/src/cli/` are scoped to a **single running assistant instance**. They operate on the assistant's local state — config, memory, contacts, trust rules, conversations, autonomy, etc. — and run within the context of the assistant's workspace.
 
 This contrasts with `cli/`, which manages the **lifecycle of assistant instances** (create, start, stop, delete) and operates across instances. See `cli/AGENTS.md`.
 
@@ -15,7 +15,7 @@ This contrasts with `cli/`, which manages the **lifecycle of assistant instances
 | Implicitly scoped to the running assistant          | Requires specifying which assistant to target   |
 | May require or start the daemon                     | Works without an assistant process running      |
 
-Examples: `config`, `contacts`, `memory`, `autonomy`, `sessions`, `doctor` belong here. `hatch`, `wake`, `sleep`, `retire`, `ps`, `ssh` belong in `cli/`.
+Examples: `config`, `contacts`, `memory`, `autonomy`, `conversations`, `doctor` belong here. `hatch`, `wake`, `sleep`, `retire`, `ps`, `ssh` belong in `cli/`.
 
 ## Conventions
 

package/src/cli/commands/avatar.ts

@@ -0,0 +1,281 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+import type { Command } from "commander";
+
+import { renderCharacterAscii } from "../../avatar/ascii-renderer.js";
+import { getCharacterComponents } from "../../avatar/character-components.js";
+import {
+  type CharacterTraits,
+  writeTraitsAndRenderAvatar,
+} from "../../avatar/traits-png-sync.js";
+import { getWorkspaceDir } from "../../util/platform.js";
+import { log } from "../logger.js";
+import { writeOutput } from "../output.js";
+
+export function registerAvatarCommand(program: Command): void {
+  const avatar = program
+    .command("avatar")
+    .description("Manage the assistant's avatar");
+
+  avatar.addHelpText(
+    "after",
+    `
+The avatar system supports two modes:
+
+  1. Native character — a procedurally generated character with configurable
+     body shape, eye style, and color. The character is rendered as both a
+     PNG image and ASCII art. Use the "character" subcommand group to manage
+     native character avatars.
+
+  2. Custom image — an externally provided image file placed directly in the
+     avatar directory. Custom images are not managed through this CLI.
+
+Files are stored in ~/.vellum/workspace/data/avatar/:
+  character-traits.json   Current trait selection (bodyShape, eyeStyle, color)
+  avatar-image.png        Rendered PNG of the character
+  character-ascii.txt     ASCII art representation of the character
+
+Examples:
+  $ assistant avatar character update --body-shape blob --eye-style curious --color green
+  $ assistant avatar character components
+  $ assistant avatar character ascii`,
+  );
+
+  const character = avatar
+    .command("character")
+    .description("Manage the native character avatar");
+
+  character.addHelpText(
+    "after",
+    `
+A native character avatar is composed of three traits:
+  - body shape: the silhouette of the character (e.g. blob, cloud, star)
+  - eye style: the expression of the character's eyes (e.g. curious, gentle)
+  - color: the body fill color (e.g. green, purple, teal)
+
+Use "character components" to list all available values for each trait.
+Use "character update" to set traits and regenerate the avatar files.
+Use "character ascii" to preview the current character in the terminal.
+
+Examples:
+  $ assistant avatar character update --body-shape blob --eye-style curious --color green
+  $ assistant avatar character components --json
+  $ assistant avatar character ascii --width 40`,
+  );
+
+  character
+    .command("update")
+    .description("Set character traits and regenerate avatar")
+    .requiredOption(
+      "--body-shape <shape>",
+      "Body shape (e.g. blob, cloud, star)",
+    )
+    .requiredOption(
+      "--eye-style <style>",
+      "Eye style (e.g. curious, gentle, goofy)",
+    )
+    .requiredOption("--color <color>", "Body color (e.g. green, purple, teal)")
+    .addHelpText(
+      "after",
+      `
+Sets the three character traits and regenerates all avatar files (PNG image,
+ASCII art, and traits JSON). Each trait value must be a valid ID from the
+component set — use "assistant avatar character components" to list valid IDs.
+
+The --body-shape flag sets the character silhouette. Valid values:
+  blob, cloud, sprout, star, ghost, urchin, stack, flower, burst, ninja
+
+The --eye-style flag sets the eye expression. Valid values:
+  grumpy, angry, curious, goofy, surprised, bashful, gentle, quirky, dazed
+
+The --color flag sets the body fill color. Valid values:
+  green, orange, pink, purple, teal, yellow
+
+On success, writes three files to ~/.vellum/workspace/data/avatar/:
+  character-traits.json, avatar-image.png, character-ascii.txt
+
+Examples:
+  $ assistant avatar character update --body-shape blob --eye-style curious --color green
+  $ assistant avatar character update --body-shape star --eye-style goofy --color purple
+  $ assistant avatar character update --body-shape ghost --eye-style gentle --color teal`,
+    )
+    .action(
+      async (opts: { bodyShape: string; eyeStyle: string; color: string }) => {
+        const components = getCharacterComponents();
+
+        const validBodyShapes = components.bodyShapes.map((b) => b.id);
+        if (!validBodyShapes.includes(opts.bodyShape)) {
+          log.error(
+            `Invalid body shape: "${opts.bodyShape}". Valid options: ${validBodyShapes.join(", ")}`,
+          );
+          process.exitCode = 1;
+          return;
+        }
+
+        const validEyeStyles = components.eyeStyles.map((e) => e.id);
+        if (!validEyeStyles.includes(opts.eyeStyle)) {
+          log.error(
+            `Invalid eye style: "${opts.eyeStyle}". Valid options: ${validEyeStyles.join(", ")}`,
+          );
+          process.exitCode = 1;
+          return;
+        }
+
+        const validColors = components.colors.map((c) => c.id);
+        if (!validColors.includes(opts.color)) {
+          log.error(
+            `Invalid color: "${opts.color}". Valid options: ${validColors.join(", ")}`,
+          );
+          process.exitCode = 1;
+          return;
+        }
+
+        const result = writeTraitsAndRenderAvatar({
+          bodyShape: opts.bodyShape,
+          eyeStyle: opts.eyeStyle,
+          color: opts.color,
+        });
+
+        if (!result.ok) {
+          log.error(
+            `Failed to write traits and render avatar: ${result.message}`,
+          );
+          process.exitCode = 1;
+          return;
+        }
+
+        const avatarDir = join(getWorkspaceDir(), "data", "avatar");
+        log.info(
+          `Avatar updated: ${opts.bodyShape} body, ${opts.eyeStyle} eyes, ${opts.color} color`,
+        );
+        log.info(`Files written to: ${avatarDir}`);
+        log.info(`  character-traits.json`);
+        log.info(`  avatar-image.png`);
+        if (result.asciiWritten) {
+          log.info(`  character-ascii.txt`);
+        }
+      },
+    );
+
+  character
+    .command("components")
+    .description("List available character traits")
+    .option("--json", "Machine-readable JSON output")
+    .addHelpText(
+      "after",
+      `
+Lists all available values for each character trait: body shapes, eye styles,
+and colors. Each value is shown with its ID (the string you pass to
+"character update").
+
+With --json, outputs the full components object including SVG path data,
+viewBox dimensions, and face-center coordinates — useful for programmatic
+consumption.
+
+Without --json, prints a human-readable summary of IDs only.
+
+Examples:
+  $ assistant avatar character components
+  $ assistant avatar character components --json`,
+    )
+    .action((opts: { json?: boolean }, cmd: Command) => {
+      const components = getCharacterComponents();
+
+      if (opts.json) {
+        writeOutput(cmd, components);
+        return;
+      }
+
+      log.info("Body shapes:");
+      for (const shape of components.bodyShapes) {
+        log.info(`  ${shape.id}`);
+      }
+
+      log.info("");
+      log.info("Eye styles:");
+      for (const style of components.eyeStyles) {
+        log.info(`  ${style.id}`);
+      }
+
+      log.info("");
+      log.info("Colors:");
+      for (const color of components.colors) {
+        log.info(`  ${color.id} (${color.hex})`);
+      }
+    });
+
+  character
+    .command("ascii")
+    .description("Print the current character as ASCII art")
+    .option("--width <n>", "Output width in characters", "60")
+    .addHelpText(
+      "after",
+      `
+Reads the current character traits from character-traits.json and renders
+the character as ASCII art to stdout. The output uses a brightness ramp
+optimized for dark terminal backgrounds.
+
+The --width flag controls the number of characters per line (default: 60).
+Terminal cells are roughly twice as tall as they are wide, so the renderer
+compensates automatically — a 60-character-wide output will look correctly
+proportioned in most terminals.
+
+If no character has been set yet, prints an error and suggests using
+"assistant avatar character update" first.
+
+Examples:
+  $ assistant avatar character ascii
+  $ assistant avatar character ascii --width 40
+  $ assistant avatar character ascii --width 80`,
+    )
+    .action(async (opts: { width: string }) => {
+      const avatarDir = join(getWorkspaceDir(), "data", "avatar");
+      const traitsPath = join(avatarDir, "character-traits.json");
+
+      if (!existsSync(traitsPath)) {
+        log.error(
+          "No native character set. Use `assistant avatar character update` first.",
+        );
+        process.exitCode = 1;
+        return;
+      }
+
+      let traits: CharacterTraits;
+      try {
+        const raw = readFileSync(traitsPath, "utf-8");
+        traits = JSON.parse(raw) as CharacterTraits;
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        log.error(`Failed to read character traits: ${message}`);
+        process.exitCode = 1;
+        return;
+      }
+
+      if (!/^\d+$/.test(opts.width)) {
+        log.error(
+          `Invalid width: "${opts.width}". Must be a positive integer.`,
+        );
+        process.exitCode = 1;
+        return;
+      }
+
+      const width = parseInt(opts.width, 10);
+      if (width < 1) {
+        log.error(
+          `Invalid width: "${opts.width}". Must be a positive integer.`,
+        );
+        process.exitCode = 1;
+        return;
+      }
+
+      const asciiArt = renderCharacterAscii(
+        traits.bodyShape,
+        traits.eyeStyle,
+        traits.color,
+        width,
+      );
+
+      process.stdout.write(asciiArt + "\n");
+    });
+}

package/src/cli/commands/bash.ts

@@ -10,7 +10,7 @@ import { join } from "node:path";
 
 import type { Command } from "commander";
 
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getSignalsDir } from "../../util/platform.js";
 import { log } from "../logger.js";
 
 const DEFAULT_TIMEOUT_MS = 30_000;
@@ -47,6 +47,9 @@ This is a developer debugging tool for inspecting how the assistant invokes and
 observes shell commands. The command runs with the assistant's environment, working
 directory, and process context — not the caller's shell.
 
+Requires the assistant to be running with VELLUM_DEBUG=1. When debug mode is off
+(the default), the assistant ignores bash signal files and returns an error.
+
 The CLI writes the command to signals/bash.<requestId> and polls
 signals/bash.<requestId>.result for the output. The assistant must be running
 for this to work.
@@ -70,7 +73,7 @@ Examples:
       }
 
       const requestId = randomUUID();
-      const signalsDir = join(getWorkspaceDir(), "signals");
+      const signalsDir = getSignalsDir();
 
       try {
         mkdirSync(signalsDir, { recursive: true });
@@ -130,7 +133,7 @@ Examples:
         cleanupSignalFiles();
 
         if (result.error) {
-          log.error(`Spawn error: ${result.error}`);
+          log.error(result.error);
           process.exitCode = 1;
           return;
         }

package/src/cli/commands/channel-verification-sessions.ts

@@ -112,7 +112,10 @@ Examples:
       "Destination address for outbound verification (handle, phone number, or user ID)",
     )
     .option("--rebind", "Replace existing guardian binding")
-    .option("--session-id <sessionId>", "Session ID for inbound challenges")
+    .option(
+      "--conversation-id <conversationId>",
+      "Conversation ID for inbound challenges",
+    )
     .option(
       "--origin-conversation-id <id>",
       "Origin conversation ID for routing",
@@ -147,7 +150,7 @@ Examples:
   $ assistant channel-verification-sessions create --purpose trusted_contact --contact-channel-id abc-123
   $ assistant channel-verification-sessions create --channel telegram --destination "@guardian_handle"
   $ assistant channel-verification-sessions create --channel phone --destination "+15551234567" --rebind
-  $ assistant channel-verification-sessions create --channel telegram --session-id sess-123`,
+  $ assistant channel-verification-sessions create --channel telegram --conversation-id conv-123`,
     )
     .action(
       async (
@@ -155,7 +158,7 @@ Examples:
           channel?: string;
           destination?: string;
           rebind?: boolean;
-          sessionId?: string;
+          conversationId?: string;
           originConversationId?: string;
           purpose?: string;
           contactChannelId?: string;
@@ -249,7 +252,7 @@ Examples:
           const result = createInboundChallenge(
             channel,
             opts.rebind,
-            opts.sessionId,
+            opts.conversationId,
           );
           writeOutput(cmd, result);
           if (!result.success) {

package/src/cli/commands/completions.ts

@@ -35,7 +35,7 @@ Examples:
     )
     .action((shell: string) => {
       const subcommands: Record<string, string[]> = {
-        sessions: ["list", "new", "export", "clear"],
+        conversations: ["list", "new", "export", "clear"],
         config: ["set", "get", "list", "validate-allowlist"],
         keys: ["list", "set", "delete"],
         trust: ["list", "remove", "clear"],
@@ -45,7 +45,7 @@ Examples:
         autonomy: ["get", "set"],
       };
       const topLevel = [
-        "sessions",
+        "conversations",
         "config",
         "keys",
         "trust",
@@ -128,7 +128,7 @@ function generateZshCompletion(
 _assistant() {
     local -a commands
     commands=(
-        'sessions:Manage sessions'
+        'conversations:Manage conversations'
         'config:Manage configuration'
         'keys:Manage API keys in secure storage'
         'trust:Manage trust rules'
@@ -169,7 +169,7 @@ function generateFishCompletion(
   script += `complete -c assistant -f\n`;
 
   const descriptions: Record<string, string> = {
-    sessions: "Manage sessions",
+    conversations: "Manage conversations",
     config: "Manage configuration",
     keys: "Manage API keys in secure storage",
     trust: "Manage trust rules",