@vellumai/cli 0.8.1 → 0.8.3

package/src/components/DefaultMainScreen.tsx

@@ -1,5 +1,4 @@
 import { spawn } from "child_process";
-import { randomUUID } from "crypto";
 import { basename } from "path";
 import {
   useCallback,
@@ -14,7 +13,6 @@ import { Box, render as inkRender, Text, useInput, useStdout } from "ink";
 import { removeAssistantEntry } from "../lib/assistant-config";
 
 import { SPECIES_CONFIG, type Species } from "../lib/constants";
-import { callDoctorDaemon, type ChatLogEntry } from "../lib/doctor-client";
 import { checkHealth } from "../lib/health-check";
 import { appendHistory, loadHistory } from "../lib/input-history";
 import { tuiLog } from "../lib/tui-log";
@@ -41,7 +39,6 @@ export const ANSI = {
 export const SLASH_COMMANDS = [
   "/btw",
   "/clear",
-  "/doctor",
   "/exit",
   "/help",
   "/q",
@@ -62,7 +59,7 @@ const HEADER_PREFIX_UNICODE = "── Vellum ";
 const HEADER_PREFIX_ASCII = "-- Vellum ";
 
 // Left panel structure: HEADER lines + art + FOOTER lines
-const LEFT_HEADER_LINES = 3; // spacer + heading + spacer
+const LEFT_HEADER_LINES = 4; // spacer + eyebrow + title + spacer
 const LEFT_FOOTER_LINES = 3; // spacer + runtimeUrl + dirName
 
 // Right panel structure
@@ -70,7 +67,7 @@ const TIPS = [
   "Send a message to start chatting",
   "Use /help to see available commands",
 ];
-const RIGHT_PANEL_INFO_SECTIONS = 3; // Assistant, Species, Status — each with heading + value
+const RIGHT_PANEL_INFO_SECTIONS = 3; // Assistant ID, Species, Status — each with heading + value
 const RIGHT_PANEL_SPACERS = 2; // top spacer + spacer between tips and info
 const RIGHT_PANEL_TIPS_HEADING = 1;
 const RIGHT_PANEL_LINE_COUNT =
@@ -103,7 +100,7 @@ const MIN_FEED_ROWS = 3;
 // Feed item height estimation
 const TOOL_CALL_CHROME_LINES = 2; // header (┌) + footer (└)
 const MESSAGE_SPACING = 1;
-const HELP_DISPLAY_HEIGHT = 8;
+const HELP_DISPLAY_HEIGHT = 7;
 
 interface ListMessagesResponse {
   messages: RuntimeMessage[];
@@ -668,6 +665,21 @@ function truncateValue(value: unknown, maxLen: number): string {
   return serialized;
 }
 
+function formatHeaderTitle(assistantName?: string): string {
+  const rawTitle = assistantName?.trim() || "Meet your Assistant!";
+  const title = rawTitle.replace(/\s+/g, " ");
+  const maxTitleLength = LEFT_PANEL_WIDTH - 2;
+  const displayTitle =
+    title.length > maxTitleLength
+      ? title.slice(0, maxTitleLength - 3) + "..."
+      : title;
+  return `  ${displayTitle}`;
+}
+
+function formatHeaderEyebrow(): string {
+  return "  Assistant";
+}
+
 interface ToolCallDisplayProps {
   tc: ToolCallInfo;
 }
@@ -734,10 +746,6 @@ function HelpDisplay(): ReactElement {
         {"  /btw <question>   "}
         <Text dimColor>Ask a side question while the assistant is working</Text>
       </Text>
-      <Text>
-        {"  /doctor [question] "}
-        <Text dimColor>Run diagnostics on the remote instance via SSH</Text>
-      </Text>
       <Text>
         {"  /retire           "}
         <Text dimColor>Retire the remote instance and exit</Text>
@@ -861,28 +869,33 @@ function stripAnsi(str: string): string {
 interface DefaultMainScreenProps {
   runtimeUrl: string;
   assistantId: string;
+  assistantName?: string;
   species: Species;
   healthStatus?: string;
 }
 
 interface StyledLine {
   text: string;
-  style: "heading" | "dim" | "normal";
+  style: "heading" | "dim" | "normal" | "eyebrow" | "title" | "art";
 }
 
 function CompactHeader({
+  assistantName,
   species,
   healthStatus,
   totalWidth,
 }: {
+  assistantName?: string;
   species: Species;
   healthStatus?: string;
   totalWidth: number;
 }): ReactElement {
-  const config = SPECIES_CONFIG[species];
   const accentColor = species === "openclaw" ? "red" : "magenta";
   const status = healthStatus ?? "checking...";
-  const label = ` ${config.hatchedEmoji} ${species} ${statusEmoji(status)} `;
+  const identity = assistantName?.trim() || species;
+  const compactIdentity =
+    identity.length > 18 ? `${identity.slice(0, 15)}...` : identity;
+  const label = ` ${compactIdentity} ${statusEmoji(status)} `;
   const prefix = "── Vellum";
   const suffix = "──";
   const fillLen = Math.max(
@@ -904,13 +917,13 @@ function CompactHeader({
 function DefaultMainScreen({
   runtimeUrl,
   assistantId,
+  assistantName,
   species,
   healthStatus,
 }: DefaultMainScreenProps): ReactElement {
   const cwd = process.cwd();
   const dirName = basename(cwd);
   const config = SPECIES_CONFIG[species];
-  const art = config.art;
   const accentColor = species === "openclaw" ? "red" : "magenta";
   const caps = getTerminalCapabilities();
   const headerPrefix = caps.unicodeSupported
@@ -926,6 +939,7 @@ function DefaultMainScreen({
   if (isCompact) {
     return (
       <CompactHeader
+        assistantName={assistantName}
         species={species}
         healthStatus={healthStatus}
         totalWidth={totalWidth}
@@ -933,16 +947,21 @@ function DefaultMainScreen({
     );
   }
 
+  const art = config.art;
   const rightPanelWidth = Math.max(1, totalWidth - LEFT_PANEL_WIDTH);
 
-  const leftLines = [
-    " ",
-    "    Meet your Assistant!",
-    " ",
-    ...art.map((l) => `  ${stripAnsi(l)}`),
-    " ",
-    `  ${runtimeUrl}`,
-    `  ~/${dirName}`,
+  const leftLines: StyledLine[] = [
+    { text: " ", style: "normal" },
+    { text: formatHeaderEyebrow(), style: "eyebrow" },
+    { text: formatHeaderTitle(assistantName), style: "title" },
+    { text: " ", style: "normal" },
+    ...art.map((line) => ({
+      text: `  ${stripAnsi(line)}`,
+      style: "art" as const,
+    })),
+    { text: " ", style: "normal" },
+    { text: `  ${runtimeUrl}`, style: "dim" },
+    { text: `  ~/${dirName}`, style: "dim" },
   ];
 
   const rightLines: StyledLine[] = [
@@ -950,7 +969,7 @@ function DefaultMainScreen({
     { text: "Tips for getting started", style: "heading" },
     ...TIPS.map((t) => ({ text: t, style: "normal" as const })),
     { text: " ", style: "normal" },
-    { text: "Assistant", style: "heading" },
+    { text: "Assistant ID", style: "heading" },
     { text: assistantId, style: "dim" },
     { text: "Species", style: "heading" },
     {
@@ -972,29 +991,37 @@ function DefaultMainScreen({
       <Box flexDirection="row">
         <Box flexDirection="column" width={LEFT_PANEL_WIDTH}>
           {Array.from({ length: maxLines }, (_, i) => {
-            const line = leftLines[i] ?? " ";
-            if (i === 1) {
+            const item = leftLines[i];
+            if (!item) return <Text key={i}> </Text>;
+            if (item.style === "eyebrow") {
+              return (
+                <Text key={i} color={caps.isDumb ? undefined : accentColor}>
+                  {item.text}
+                </Text>
+              );
+            }
+            if (item.style === "title") {
               return (
                 <Text key={i} bold>
-                  {line}
+                  {item.text}
                 </Text>
               );
             }
-            if (i > 2 && i <= 2 + art.length) {
+            if (item.style === "art") {
               return (
                 <Text key={i} color={caps.isDumb ? undefined : accentColor}>
-                  {line}
+                  {item.text}
                 </Text>
               );
             }
-            if (i > 2 + art.length) {
+            if (item.style === "dim") {
               return (
                 <Text key={i} dimColor>
-                  {line}
+                  {item.text}
                 </Text>
               );
             }
-            return <Text key={i}>{line}</Text>;
+            return <Text key={i}>{item.text}</Text>;
           })}
         </Box>
         <Box flexDirection="column" width={rightPanelWidth}>
@@ -1115,8 +1142,7 @@ function calculateHeaderHeight(
   if ((terminalColumns ?? DEFAULT_TERMINAL_COLUMNS) < COMPACT_THRESHOLD) {
     return COMPACT_HEADER_HEIGHT;
   }
-  const config = SPECIES_CONFIG[species];
-  const artLength = config.art.length;
+  const artLength = SPECIES_CONFIG[species].art.length;
   const leftLineCount = LEFT_HEADER_LINES + artLength + LEFT_FOOTER_LINES;
   const maxLines = Math.max(leftLineCount, RIGHT_PANEL_LINE_COUNT);
   return maxLines + HEADER_CHROME_LINES;
@@ -1128,12 +1154,11 @@ export function render(
   runtimeUrl: string,
   assistantId: string,
   species: Species,
+  assistantName?: string,
 ): number {
   const terminalColumns = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
   const isCompact = terminalColumns < COMPACT_THRESHOLD;
-
-  const config = SPECIES_CONFIG[species];
-  const art = config.art;
+  const art = SPECIES_CONFIG[species].art;
 
   const leftLineCount = LEFT_HEADER_LINES + art.length + LEFT_FOOTER_LINES;
   const maxLines = Math.max(leftLineCount, RIGHT_PANEL_LINE_COUNT);
@@ -1142,6 +1167,7 @@ export function render(
     <DefaultMainScreen
       runtimeUrl={runtimeUrl}
       assistantId={assistantId}
+      assistantName={assistantName}
       species={species}
     />,
     { exitOnCtrlC: false },
@@ -1360,6 +1386,7 @@ export interface ChatAppHandle {
 interface ChatAppProps {
   runtimeUrl: string;
   assistantId: string;
+  assistantName?: string;
   species: Species;
   /** Pre-built auth headers (e.g. { Authorization: "Bearer ..." } for local,
    *  { "X-Session-Token": "...", "Vellum-Organization-Id": "..." } for platform). */
@@ -1373,6 +1400,7 @@ interface ChatAppProps {
 function ChatApp({
   runtimeUrl,
   assistantId,
+  assistantName,
   species,
   auth,
   project,
@@ -1405,11 +1433,9 @@ function ChatApp({
   const connectedRef = useRef(false);
   const connectingRef = useRef(false);
   const seenMessageIdsRef = useRef(new Set<string>());
-  const chatLogRef = useRef<ChatLogEntry[]>([]);
   const sseAbortRef = useRef<AbortController | null>(null);
   const streamingTextRef = useRef("");
   const streamingToolCallsRef = useRef<ToolCallInfo[]>([]);
-  const doctorSessionIdRef = useRef(randomUUID());
   const handleRef_ = useRef<ChatAppHandle | null>(null);
 
   const { stdout } = useStdout();
@@ -1840,10 +1866,6 @@ function ChatApp({
                   };
                   seenMessageIdsRef.current.add(msg.id);
                   hRef.addMessage(msg);
-                  chatLogRef.current.push({
-                    role: "assistant",
-                    content: text,
-                  });
                   process.stdout.write("\x07");
                 }
 
@@ -2012,79 +2034,6 @@ function ChatApp({
         return;
       }
 
-      if (trimmed === "/doctor" || trimmed.startsWith("/doctor ")) {
-        if (!project || !zone) {
-          h.showError(
-            "No instance info available. Connect to a hatched instance first.",
-          );
-          return;
-        }
-        const userPrompt = trimmed.slice("/doctor".length).trim() || undefined;
-        const recentChatContext = chatLogRef.current.slice(-20);
-
-        chatLogRef.current.push({ role: "user", content: trimmed });
-
-        if (userPrompt) {
-          const doctorUserMsg: RuntimeMessage = {
-            id: "local-user-" + Date.now(),
-            role: "user",
-            content: userPrompt,
-            timestamp: new Date().toISOString(),
-            label: "You (to Doctor):",
-          };
-          h.addMessage(doctorUserMsg);
-        }
-
-        h.showSpinner(`Analyzing ${assistantId}...`);
-
-        try {
-          const result = await callDoctorDaemon(
-            assistantId,
-            project,
-            zone,
-            userPrompt,
-            (event) => {
-              switch (event.phase) {
-                case "invoking_prompt":
-                  handleRef_.current?.showSpinner(
-                    `Analyzing ${assistantId}...`,
-                  );
-                  break;
-                case "calling_tool":
-                  handleRef_.current?.showSpinner(
-                    `Running ${event.toolName ?? "tool"} on ${assistantId}...`,
-                  );
-                  break;
-                case "processing_tool_result":
-                  handleRef_.current?.showSpinner(
-                    `Reviewing diagnostics for ${assistantId}...`,
-                  );
-                  break;
-              }
-            },
-            doctorSessionIdRef.current,
-            recentChatContext,
-          );
-          h.hideSpinner();
-          if (result.recommendation) {
-            h.addStatus(`Recommendation:\n${result.recommendation}`);
-            chatLogRef.current.push({
-              role: "assistant",
-              content: result.recommendation,
-            });
-          } else if (result.error) {
-            h.showError(result.error);
-            chatLogRef.current.push({ role: "error", content: result.error });
-          }
-        } catch (err) {
-          h.hideSpinner();
-          const errorMsg = `Doctor assistant unreachable: ${err instanceof Error ? err.message : err}`;
-          h.showError(errorMsg);
-          chatLogRef.current.push({ role: "error", content: errorMsg });
-        }
-        return;
-      }
-
       // If a connection attempt is already in progress, don't silently drop input
       if (connectingRef.current) {
         h.addStatus(
@@ -2201,7 +2150,6 @@ function ChatApp({
           );
           clearTimeout(timeoutId);
           if (sendResult.accepted) {
-            chatLogRef.current.push({ role: "user", content: trimmed });
             h.addStatus(
               "Message queued — will be processed after current response",
               "gray",
@@ -2233,7 +2181,6 @@ function ChatApp({
         return;
       }
 
-      chatLogRef.current.push({ role: "user", content: trimmed });
       seenMessageIdsRef.current.add("pending-user-" + Date.now());
 
       h.showSpinner("Sending...");
@@ -2264,7 +2211,6 @@ function ChatApp({
         const errorMsg =
           sendErr instanceof Error ? sendErr.message : String(sendErr);
         h.showError(errorMsg);
-        chatLogRef.current.push({ role: "error", content: errorMsg });
         return;
       }
 
@@ -2462,6 +2408,7 @@ function ChatApp({
       <DefaultMainScreen
         runtimeUrl={runtimeUrl}
         assistantId={assistantId}
+        assistantName={assistantName}
         species={species}
         healthStatus={healthStatus}
       />
@@ -2581,7 +2528,12 @@ export function renderChatApp(
   assistantId: string,
   species: Species,
   onExit: () => void,
-  options?: { auth?: Record<string, string>; project?: string; zone?: string },
+  options?: {
+    auth?: Record<string, string>;
+    project?: string;
+    zone?: string;
+    assistantName?: string;
+  },
 ): ChatAppInstance {
   let chatHandle: ChatAppHandle | null = null;
 
@@ -2589,6 +2541,7 @@ export function renderChatApp(
     <ChatApp
       runtimeUrl={runtimeUrl}
       assistantId={assistantId}
+      assistantName={options?.assistantName}
       species={species}
       auth={options?.auth}
       project={options?.project}

package/src/lib/__tests__/docker.test.ts

@@ -4,6 +4,8 @@ import {
   AVATAR_DEVICE_ENV_VAR,
   dockerResourceNames,
   resolveAvatarDevicePath,
+  resolveDockerHatchMode,
+  resolveDockerProviderCredentialSetupAction,
   type ServiceName,
 } from "../docker.js";
 import { buildServiceRunArgs } from "../statefulset.js";
@@ -103,6 +105,51 @@ describe("buildServiceRunArgs — assistant", () => {
   });
 });
 
+describe("resolveDockerProviderCredentialSetupAction", () => {
+  test("defers provider setup in detached mode", () => {
+    expect(
+      resolveDockerProviderCredentialSetupAction({
+        provider: "anthropic",
+        detached: true,
+      }),
+    ).toBe("defer");
+  });
+
+  test("reports missing guardian token only when a lease was expected", () => {
+    expect(
+      resolveDockerProviderCredentialSetupAction({
+        provider: "anthropic",
+        detached: false,
+      }),
+    ).toBe("missing-token");
+  });
+
+  test("configures provider setup when a guardian token is available", () => {
+    expect(
+      resolveDockerProviderCredentialSetupAction({
+        provider: "anthropic",
+        guardianAccessToken: "guardian-token",
+        detached: false,
+      }),
+    ).toBe("configure");
+  });
+
+  test("skips provider setup for internal hatches and detached keyless hatches", () => {
+    expect(
+      resolveDockerProviderCredentialSetupAction({
+        provider: undefined,
+        detached: false,
+      }),
+    ).toBe("skip");
+    expect(
+      resolveDockerProviderCredentialSetupAction({
+        provider: null,
+        detached: true,
+      }),
+    ).toBe("skip");
+  });
+});
+
 describe("buildServiceRunArgs — gateway", () => {
   const savedVelayBaseUrl = process.env.VELAY_BASE_URL;
 
@@ -171,3 +218,62 @@ describe("VELLUM_AVATAR_DEVICE passthrough", () => {
     );
   });
 });
+
+describe("resolveDockerHatchMode", () => {
+  test("defaults to pulling published images when no source flag is set", () => {
+    expect(
+      resolveDockerHatchMode({
+        watch: false,
+        buildFromSource: false,
+        fullSourceTreeAvailable: true,
+      }),
+    ).toEqual({ build: false, watcher: false, fellBackToPull: false });
+  });
+
+  test("--source <path> builds without enabling the file watcher", () => {
+    expect(
+      resolveDockerHatchMode({
+        watch: false,
+        buildFromSource: true,
+        fullSourceTreeAvailable: true,
+      }),
+    ).toEqual({ build: true, watcher: false, fellBackToPull: false });
+  });
+
+  test("--watch builds and enables the file watcher", () => {
+    expect(
+      resolveDockerHatchMode({
+        watch: true,
+        buildFromSource: false,
+        fullSourceTreeAvailable: true,
+      }),
+    ).toEqual({ build: true, watcher: true, fellBackToPull: false });
+  });
+
+  test("--watch + --source <path> still enables the watcher (watch wins)", () => {
+    expect(
+      resolveDockerHatchMode({
+        watch: true,
+        buildFromSource: true,
+        fullSourceTreeAvailable: true,
+      }),
+    ).toEqual({ build: true, watcher: true, fellBackToPull: false });
+  });
+
+  test("falls back to pull when source flag is set but source tree is missing", () => {
+    expect(
+      resolveDockerHatchMode({
+        watch: false,
+        buildFromSource: true,
+        fullSourceTreeAvailable: false,
+      }),
+    ).toEqual({ build: false, watcher: false, fellBackToPull: true });
+    expect(
+      resolveDockerHatchMode({
+        watch: true,
+        buildFromSource: false,
+        fullSourceTreeAvailable: false,
+      }),
+    ).toEqual({ build: false, watcher: false, fellBackToPull: true });
+  });
+});

package/src/lib/assistant-config.ts

@@ -67,6 +67,10 @@ export interface ContainerInfo {
 
 export interface AssistantEntry {
   assistantId: string;
+  /** Platform-provided display name, when available. */
+  name?: string;
+  /** Older lockfile key for the display name, if present. */
+  assistantName?: string;
   runtimeUrl: string;
   /** Loopback URL for same-machine health checks (e.g. `http://127.0.0.1:7831`).
    *  Avoids mDNS resolution issues when the machine checks its own gateway. */
@@ -85,6 +89,8 @@ export interface AssistantEntry {
   resources?: LocalInstanceResources;
   /** PID of the file watcher process for docker instances hatched with --watch. */
   watcherPid?: number;
+  /** Local bootstrap secret used to lease guardian tokens for Docker assistants after detached hatch. */
+  guardianBootstrapSecret?: string;
   /** Docker image metadata for rollback. Only present for docker topology entries. */
   containerInfo?: ContainerInfo;
   /** Docker image metadata from before the last upgrade. Enables rollback to the prior version. */
@@ -572,5 +578,3 @@ export function getLockfilePlatformBaseUrl(): string | undefined {
   if (typeof url === "string" && url.trim()) return url.trim();
   return undefined;
 }
-
-

package/src/lib/config-utils.ts

@@ -32,6 +32,24 @@ export function buildNestedConfig(
   return config;
 }
 
+/**
+ * Ensure hatch always provides enough initial LLM config for the assistant to
+ * detect a fresh off-platform hatch and seed BYOK profiles.
+ */
+export function buildHatchConfigValues(
+  configValues: Record<string, string>,
+  provider: string | null | undefined,
+): Record<string, string> {
+  if (!provider || configValues["llm.default.provider"]) {
+    return configValues;
+  }
+
+  return {
+    ...configValues,
+    "llm.default.provider": provider,
+  };
+}
+
 /**
  * Write arbitrary key-value pairs to a temporary JSON file and return its
  * path. The caller passes this path to the daemon via the