@vellumai/cli 0.6.0 → 0.6.1

package/src/commands/retire.ts

@@ -4,7 +4,7 @@ import {
 } from "../lib/assistant-config";
 import type { AssistantEntry } from "../lib/assistant-config";
 import {
-  fetchOrganizationId,
+  authHeaders,
   getPlatformUrl,
   readPlatformToken,
 } from "../lib/platform-client";
@@ -93,16 +93,11 @@ async function retireVellum(
     process.exit(1);
   }
 
-  const orgId = await fetchOrganizationId(token, runtimeUrl);
-
   const platformUrl = runtimeUrl || getPlatformUrl();
   const url = `${platformUrl}/v1/assistants/${encodeURIComponent(assistantId)}/retire/`;
   const response = await fetch(url, {
     method: "DELETE",
-    headers: {
-      "X-Session-Token": token,
-      "Vellum-Organization-Id": orgId,
-    },
+    headers: await authHeaders(token, runtimeUrl),
   });
 
   if (!response.ok) {

package/src/commands/rollback.ts

@@ -17,7 +17,6 @@ import {
 import type { ServiceName } from "../lib/docker";
 import { emitCliError, categorizeUpgradeError } from "../lib/cli-error.js";
 import {
-  fetchOrganizationId,
   readPlatformToken,
   rollbackPlatformAssistant,
 } from "../lib/platform-client.js";
@@ -35,7 +34,7 @@ import {
   UPGRADE_PROGRESS,
   waitForReady,
 } from "../lib/upgrade-lifecycle.js";
-import { parseVersion } from "../lib/version-compat.js";
+import { compareVersions } from "../lib/version-compat.js";
 
 function parseArgs(): { name: string | null; version: string | null } {
   const args = process.argv.slice(3);
@@ -153,21 +152,12 @@ async function rollbackPlatformViaEndpoint(
 
   // Step 1 — Version validation (only if version provided)
   if (version && currentVersion) {
-    const current = parseVersion(currentVersion);
-    const target = parseVersion(version);
-    if (current && target) {
-      const isOlder =
-        target.major < current.major ||
-        (target.major === current.major && target.minor < current.minor) ||
-        (target.major === current.major &&
-          target.minor === current.minor &&
-          target.patch < current.patch);
-      if (!isOlder) {
-        const msg = `Target version ${version} is not older than the current version ${currentVersion}. Use \`vellum upgrade --version ${version}\` to upgrade.`;
-        console.error(msg);
-        emitCliError("VERSION_DIRECTION", msg);
-        process.exit(1);
-      }
+    const cmp = compareVersions(version, currentVersion);
+    if (cmp !== null && cmp >= 0) {
+      const msg = `Target version ${version} is not older than the current version ${currentVersion}. Use \`vellum upgrade --version ${version}\` to upgrade.`;
+      console.error(msg);
+      emitCliError("VERSION_DIRECTION", msg);
+      process.exit(1);
     }
   }
 
@@ -181,20 +171,6 @@ async function rollbackPlatformViaEndpoint(
     process.exit(1);
   }
 
-  let orgId: string;
-  try {
-    orgId = await fetchOrganizationId(token, entry.runtimeUrl);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (msg.includes("401") || msg.includes("403")) {
-      console.error("Authentication failed. Run 'vellum login' to refresh.");
-    } else {
-      console.error(`Error: ${msg}`);
-    }
-    emitCliError("AUTH_FAILED", "Failed to authenticate with platform", msg);
-    process.exit(1);
-  }
-
   // Step 3 — Call rollback endpoint
   if (version) {
     console.log(`Rolling back to ${version}...`);
@@ -204,12 +180,7 @@ async function rollbackPlatformViaEndpoint(
 
   let result: { detail: string; version: string | null };
   try {
-    result = await rollbackPlatformAssistant(
-      token,
-      orgId,
-      version,
-      entry.runtimeUrl,
-    );
+    result = await rollbackPlatformAssistant(token, version, entry.runtimeUrl);
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
 

package/src/commands/teleport.ts

@@ -12,7 +12,6 @@ import {
 } from "../lib/guardian-token.js";
 import {
   readPlatformToken,
-  fetchOrganizationId,
   getPlatformUrl,
   hatchAssistant,
   platformInitiateExport,
@@ -423,7 +422,7 @@ async function importViaHttp(
         "Content-Type": "application/octet-stream",
       },
       body: new Blob([bundleData]),
-      signal: AbortSignal.timeout(120_000),
+      signal: AbortSignal.timeout(300_000),
     });
 
     // Retry once with a fresh token on 401
@@ -447,13 +446,13 @@ async function importViaHttp(
             "Content-Type": "application/octet-stream",
           },
           body: new Blob([bundleData]),
-          signal: AbortSignal.timeout(120_000),
+          signal: AbortSignal.timeout(300_000),
         });
       }
     }
   } catch (err) {
     if (err instanceof Error && err.name === "TimeoutError") {
-      console.error("Error: Import request timed out after 2 minutes.");
+      console.error("Error: Import request timed out after 5 minutes.");
       process.exit(1);
     }
     const msg = err instanceof Error ? err.message : String(err);
@@ -489,36 +488,12 @@ async function exportFromAssistant(
       process.exit(1);
     }
 
-    let orgId: string;
-    try {
-      orgId = await fetchOrganizationId(token, entry.runtimeUrl);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("401") || msg.includes("403")) {
-        console.error("Authentication failed. Run 'vellum login' to refresh.");
-        process.exit(1);
-      }
-      throw err;
-    }
-
     // Initiate export job
-    let jobId: string;
-    try {
-      const result = await platformInitiateExport(
-        token,
-        orgId,
-        "teleport export",
-        entry.runtimeUrl,
-      );
-      jobId = result.jobId;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("401") || msg.includes("403")) {
-        console.error("Authentication failed. Run 'vellum login' to refresh.");
-        process.exit(1);
-      }
-      throw err;
-    }
+    const { jobId } = await platformInitiateExport(
+      token,
+      "teleport export",
+      entry.runtimeUrl,
+    );
 
     console.log(`Export started (job ${jobId})...`);
 
@@ -531,12 +506,7 @@ async function exportFromAssistant(
     while (Date.now() < deadline) {
       let status: { status: string; downloadUrl?: string; error?: string };
       try {
-        status = await platformPollExportStatus(
-          jobId,
-          token,
-          orgId,
-          entry.runtimeUrl,
-        );
+        status = await platformPollExportStatus(jobId, token, entry.runtimeUrl);
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         if (msg.includes("not found")) {
@@ -642,18 +612,6 @@ async function importToAssistant(
       process.exit(1);
     }
 
-    let orgId: string;
-    try {
-      orgId = await fetchOrganizationId(token, entry.runtimeUrl);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("401") || msg.includes("403")) {
-        console.error("Authentication failed. Run 'vellum login' to refresh.");
-        process.exit(1);
-      }
-      throw err;
-    }
-
     // Use pre-uploaded bundle key if provided (string), skip upload if null
     // (signals signed URLs were already tried and unavailable), or try
     // signed-URL upload if undefined (never attempted).
@@ -663,7 +621,6 @@ async function importToAssistant(
       try {
         const { uploadUrl, bundleKey: key } = await platformRequestUploadUrl(
           token,
-          orgId,
           entry.runtimeUrl,
         );
         bundleKey = key;
@@ -692,15 +649,9 @@ async function importToAssistant(
           ? await platformImportPreflightFromGcs(
               bundleKey,
               token,
-              orgId,
               entry.runtimeUrl,
             )
-          : await platformImportPreflight(
-              bundleData,
-              token,
-              orgId,
-              entry.runtimeUrl,
-            );
+          : await platformImportPreflight(bundleData, token, entry.runtimeUrl);
       } catch (err) {
         if (err instanceof Error && err.name === "TimeoutError") {
           console.error("Error: Preflight request timed out after 2 minutes.");
@@ -751,21 +702,11 @@ async function importToAssistant(
     let importResult: { statusCode: number; body: Record<string, unknown> };
     try {
       importResult = bundleKey
-        ? await platformImportBundleFromGcs(
-            bundleKey,
-            token,
-            orgId,
-            entry.runtimeUrl,
-          )
-        : await platformImportBundle(
-            bundleData,
-            token,
-            orgId,
-            entry.runtimeUrl,
-          );
+        ? await platformImportBundleFromGcs(bundleKey, token, entry.runtimeUrl)
+        : await platformImportBundle(bundleData, token, entry.runtimeUrl);
     } catch (err) {
       if (err instanceof Error && err.name === "TimeoutError") {
-        console.error("Error: Import request timed out after 2 minutes.");
+        console.error("Error: Import request timed out after 5 minutes.");
         process.exit(1);
       }
       throw err;
@@ -796,7 +737,6 @@ async function importToAssistant(
 export async function resolveOrHatchTarget(
   targetEnv: "local" | "docker" | "platform",
   targetName?: string,
-  orgId?: string,
 ): Promise<AssistantEntry> {
   // If a name is provided, try to find an existing assistant
   if (targetName) {
@@ -876,25 +816,7 @@ export async function resolveOrHatchTarget(
       process.exit(1);
     }
 
-    let resolvedOrgId: string;
-    if (orgId) {
-      resolvedOrgId = orgId;
-    } else {
-      try {
-        resolvedOrgId = await fetchOrganizationId(token);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (msg.includes("401") || msg.includes("403")) {
-          console.error(
-            "Authentication failed. Run 'vellum login' to refresh.",
-          );
-          process.exit(1);
-        }
-        throw err;
-      }
-    }
-
-    const result = await hatchAssistant(token, resolvedOrgId);
+    const result = await hatchAssistant(token);
     const entry: AssistantEntry = {
       assistantId: result.id,
       runtimeUrl: getPlatformUrl(),
@@ -1170,7 +1092,7 @@ export async function teleport(): Promise<void> {
   // Platform target: reordered flow — upload to GCS before hatching so that
   // if upload fails, no empty assistant is left dangling on the platform.
   if (targetEnv === "platform") {
-    // Step B — Auth + Org ID
+    // Step B — Auth
     const token = readPlatformToken();
     if (!token) {
       console.error("Not logged in. Run 'vellum login' first.");
@@ -1191,22 +1113,10 @@ export async function teleport(): Promise<void> {
       }
     }
 
-    // Use the existing target's runtimeUrl for all platform calls so upload,
-    // org ID fetch, and import hit the same instance.
+    // Use the existing target's runtimeUrl for all platform calls so upload
+    // and import hit the same instance.
     const targetPlatformUrl = existingTarget?.runtimeUrl;
 
-    let orgId: string;
-    try {
-      orgId = await fetchOrganizationId(token, targetPlatformUrl);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("401") || msg.includes("403")) {
-        console.error("Authentication failed. Run 'vellum login' to refresh.");
-        process.exit(1);
-      }
-      throw err;
-    }
-
     // Step C — Upload to GCS
     // bundleKey: string = uploaded successfully, null = tried but unavailable,
     // undefined would mean "never tried" (not used here).
@@ -1214,7 +1124,6 @@ export async function teleport(): Promise<void> {
     try {
       const { uploadUrl, bundleKey: key } = await platformRequestUploadUrl(
         token,
-        orgId,
         targetPlatformUrl,
       );
       bundleKey = key;
@@ -1231,7 +1140,7 @@ export async function teleport(): Promise<void> {
     }
 
     // Step D — Hatch (upload succeeded or fallback to inline — safe to hatch)
-    const toEntry = await resolveOrHatchTarget(targetEnv, targetName, orgId);
+    const toEntry = await resolveOrHatchTarget(targetEnv, targetName);
     const toCloud = resolveCloud(toEntry);
 
     // Step E — Import from GCS (or inline fallback)

package/src/commands/upgrade.ts

@@ -18,7 +18,7 @@ import {
 } from "../lib/docker";
 import { resolveImageRefs } from "../lib/platform-releases";
 import {
-  fetchOrganizationId,
+  authHeaders,
   getPlatformUrl,
   readPlatformToken,
 } from "../lib/platform-client";
@@ -42,7 +42,7 @@ import {
   UPGRADE_PROGRESS,
   waitForReady,
 } from "../lib/upgrade-lifecycle.js";
-import { parseVersion } from "../lib/version-compat.js";
+import { compareVersions } from "../lib/version-compat.js";
 
 interface UpgradeArgs {
   name: string | null;
@@ -193,21 +193,12 @@ async function upgradeDocker(
   // Users should use `vellum rollback --version <version>` for downgrades.
   const currentVersion = entry.serviceGroupVersion;
   if (currentVersion && versionTag) {
-    const current = parseVersion(currentVersion);
-    const target = parseVersion(versionTag);
-    if (current && target) {
-      const isOlder =
-        target.major < current.major ||
-        (target.major === current.major && target.minor < current.minor) ||
-        (target.major === current.major &&
-          target.minor === current.minor &&
-          target.patch < current.patch);
-      if (isOlder) {
-        const msg = `Cannot upgrade to an older version (${versionTag} < ${currentVersion}). Use \`vellum rollback --version ${versionTag}\` instead.`;
-        console.error(msg);
-        emitCliError("VERSION_DIRECTION", msg);
-        process.exit(1);
-      }
+    const cmp = compareVersions(versionTag, currentVersion);
+    if (cmp !== null && cmp < 0) {
+      const msg = `Cannot upgrade to an older version (${versionTag} < ${currentVersion}). Use \`vellum rollback --version ${versionTag}\` instead.`;
+      console.error(msg);
+      emitCliError("VERSION_DIRECTION", msg);
+      process.exit(1);
     }
   }
 
@@ -694,21 +685,12 @@ async function upgradePlatform(
   // we must not block the request based on the local CLI version.
   const currentVersion = entry.serviceGroupVersion;
   if (version && currentVersion) {
-    const current = parseVersion(currentVersion);
-    const target = parseVersion(version);
-    if (current && target) {
-      const isOlder =
-        target.major < current.major ||
-        (target.major === current.major && target.minor < current.minor) ||
-        (target.major === current.major &&
-          target.minor === current.minor &&
-          target.patch < current.patch);
-      if (isOlder) {
-        const msg = `Cannot upgrade to an older version (${version} < ${currentVersion}). Use \`vellum rollback --version ${version}\` instead.`;
-        console.error(msg);
-        emitCliError("VERSION_DIRECTION", msg);
-        process.exit(1);
-      }
+    const cmp = compareVersions(version, currentVersion);
+    if (cmp !== null && cmp < 0) {
+      const msg = `Cannot upgrade to an older version (${version} < ${currentVersion}). Use \`vellum rollback --version ${version}\` instead.`;
+      console.error(msg);
+      emitCliError("VERSION_DIRECTION", msg);
+      process.exit(1);
     }
   }
 
@@ -725,7 +707,7 @@ async function upgradePlatform(
     process.exit(1);
   }
 
-  const orgId = await fetchOrganizationId(token, entry.runtimeUrl);
+  const headers = await authHeaders(token, entry.runtimeUrl);
 
   const url = `${entry.runtimeUrl || getPlatformUrl()}/v1/assistants/upgrade/`;
   const body: { assistant_id?: string; version?: string } = {
@@ -737,14 +719,28 @@ async function upgradePlatform(
 
   const response = await fetch(url, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "X-Session-Token": token,
-      "Vellum-Organization-Id": orgId,
-    },
+    headers,
     body: JSON.stringify(body),
   });
 
+  if (response.status === 401 || response.status === 403) {
+    const text = await response.text();
+    console.error(
+      `Authentication failed (${response.status}). Run 'vellum login' to refresh.`,
+    );
+    emitCliError("AUTH_FAILED", "Authentication failed", text);
+    try {
+      await broadcastUpgradeEvent(
+        entry.runtimeUrl,
+        entry.assistantId,
+        buildCompleteEvent(entry.serviceGroupVersion ?? "unknown", false),
+      );
+    } catch {
+      // Best-effort — broadcast may fail if the assistant is unreachable
+    }
+    process.exit(1);
+  }
+
   if (!response.ok) {
     const text = await response.text();
     console.error(
@@ -755,11 +751,15 @@ async function upgradePlatform(
       `Platform upgrade failed (${response.status})`,
       text,
     );
-    await broadcastUpgradeEvent(
-      entry.runtimeUrl,
-      entry.assistantId,
-      buildCompleteEvent(entry.serviceGroupVersion ?? "unknown", false),
-    );
+    try {
+      await broadcastUpgradeEvent(
+        entry.runtimeUrl,
+        entry.assistantId,
+        buildCompleteEvent(entry.serviceGroupVersion ?? "unknown", false),
+      );
+    } catch {
+      // Best-effort — broadcast may fail if the assistant is unreachable
+    }
     process.exit(1);
   }
 

package/src/index.ts

@@ -4,8 +4,10 @@ import cliPkg from "../package.json";
 import { backup } from "./commands/backup";
 import { clean } from "./commands/clean";
 import { client } from "./commands/client";
+import { events } from "./commands/events";
 import { hatch } from "./commands/hatch";
 import { login, logout, whoami } from "./commands/login";
+import { message } from "./commands/message";
 import { pair } from "./commands/pair";
 import { ps } from "./commands/ps";
 import { recover } from "./commands/recover";
@@ -33,9 +35,11 @@ const commands = {
   backup,
   clean,
   client,
+  events,
   hatch,
   login,
   logout,
+  message,
   pair,
   ps,
   recover,
@@ -62,9 +66,11 @@ function printHelp(): void {
   console.log("  backup   Export a backup of a running assistant");
   console.log("  clean    Kill orphaned vellum processes");
   console.log("  client   Connect to a hatched assistant");
+  console.log("  events   Stream events from a running assistant");
   console.log("  hatch    Create a new assistant instance");
   console.log("  login    Log in to the Vellum platform");
   console.log("  logout   Log out of the Vellum platform");
+  console.log("  message  Send a message to a running assistant");
   console.log("  pair     Pair with a remote assistant via QR code");
   console.log(
     "  ps       List assistants (or processes for a specific assistant)",

package/src/lib/arg-utils.ts

@@ -0,0 +1,13 @@
+/** Extract a named flag's value from an arg list, returning [value, remaining]. */
+export function extractFlag(
+  args: string[],
+  flag: string,
+): [string | undefined, string[]] {
+  const idx = args.indexOf(flag);
+  if (idx === -1 || idx + 1 >= args.length) {
+    return [undefined, args.filter((a) => a !== flag)];
+  }
+  const value = args[idx + 1]!;
+  const remaining = [...args.slice(0, idx), ...args.slice(idx + 2)];
+  return [value, remaining];
+}