@vellumai/cli 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "CLI tools for vellum-assistant",
   "type": "module",
   "exports": {

package/src/commands/ps.ts

@@ -145,7 +145,7 @@ async function getRemoteProcessesCustom(
   ]);
 }
 
-async function getLocalProcesses(): Promise<TableRow[]> {
+function getLocalProcesses(): TableRow[] {
   const rows: TableRow[] = [];
   const vellumDir = join(homedir(), ".vellum");
 
@@ -179,21 +179,19 @@ async function getLocalProcesses(): Promise<TableRow[]> {
     rows.push({ name: "qdrant", status: withStatusEmoji("not running"), info: "no PID file" });
   }
 
-  // Check gateway via ps
-  try {
-    const output = await execOutput("ps", ["ax", "-o", "pid=,command="]);
-    const gatewayLines = output
-      .split("\n")
-      .filter((l) => /gateway\/src\/index\.ts/.test(l) && !l.includes("grep"));
-    if (gatewayLines.length > 0) {
-      const trimmed = gatewayLines[0].trim();
-      const pid = trimmed.split(/\s+/)[0];
-      rows.push({ name: "gateway", status: withStatusEmoji("running"), info: `PID ${pid} | port 7830` });
-    } else {
-      rows.push({ name: "gateway", status: withStatusEmoji("not running"), info: "" });
+  // Check gateway PID
+  const gatewayPidFile = join(vellumDir, "gateway.pid");
+  if (existsSync(gatewayPidFile)) {
+    const pid = readFileSync(gatewayPidFile, "utf-8").trim();
+    let status = "running";
+    try {
+      process.kill(parseInt(pid, 10), 0);
+    } catch {
+      status = "not running";
     }
-  } catch {
-    rows.push({ name: "gateway", status: withStatusEmoji("unknown"), info: "" });
+    rows.push({ name: "gateway", status: withStatusEmoji(status), info: `PID ${pid} | port 7830` });
+  } else {
+    rows.push({ name: "gateway", status: withStatusEmoji("not running"), info: "no PID file" });
   }
 
   return rows;
@@ -205,7 +203,7 @@ async function showAssistantProcesses(entry: AssistantEntry): Promise<void> {
   console.log(`Processes for ${entry.assistantId} (${cloud}):\n`);
 
   if (cloud === "local") {
-    const rows = await getLocalProcesses();
+    const rows = getLocalProcesses();
     printTable(rows);
     return;
   }

package/src/components/DefaultMainScreen.tsx

@@ -28,7 +28,6 @@ export const SLASH_COMMANDS = ["/clear", "/doctor", "/exit", "/help", "/q", "/qu
 const POLL_INTERVAL_MS = 3000;
 const SEND_TIMEOUT_MS = 5000;
 const RESPONSE_POLL_INTERVAL_MS = 1000;
-const RESPONSE_TIMEOUT_MS = 180000;
 
 interface ListMessagesResponse {
   messages: RuntimeMessage[];
@@ -59,9 +58,6 @@ interface PendingConfirmation {
   executionTarget?: "sandbox" | "host";
   allowlistOptions?: AllowlistOption[];
   scopeOptions?: ScopeOption[];
-  principalKind?: string;
-  principalId?: string;
-  principalVersion?: string;
   persistentDecisionsAllowed?: boolean;
 }
 
@@ -1021,8 +1017,8 @@ function ChatApp({
     : secretInput
       ? 5
       : spinnerText
-        ? 2
-        : 1;
+        ? 4
+        : 3;
   const availableRows = Math.max(3, terminalRows - headerHeight - bottomHeight);
 
   const addMessage = useCallback((msg: RuntimeMessage) => {
@@ -1515,8 +1511,7 @@ function ChatApp({
 
         h.showSpinner("Working...");
 
-        const startTime = Date.now();
-        while (Date.now() - startTime < RESPONSE_TIMEOUT_MS) {
+        while (true) {
           await new Promise((resolve) => setTimeout(resolve, RESPONSE_POLL_INTERVAL_MS));
 
           if (runId) {
@@ -1609,26 +1604,6 @@ function ChatApp({
           }
         }
 
-        h.setBusy(false);
-        h.hideSpinner();
-        h.showError("Response timed out. The assistant may still be processing.");
-        try {
-          const doctorResult = await callDoctorDaemon(
-            assistantId,
-            project,
-            zone,
-            undefined,
-            undefined,
-            doctorSessionIdRef.current,
-          );
-          if (doctorResult.diagnostics) {
-            h.addStatus(
-              `--- SSH Diagnostics ---\n${doctorResult.diagnostics}\n--- End Diagnostics ---`,
-            );
-          }
-        } catch {
-          // Doctor daemon unreachable; skip diagnostics
-        }
       } catch (error) {
         h.setBusy(false);
         h.hideSpinner();
@@ -1852,9 +1827,11 @@ function ChatApp({
       ) : null}
 
       {!selection && !secretInput ? (
-        <Box>
-          <Text color="green" bold>
-            you{">"}
+        <Box flexDirection="column">
+          <Text dimColor>{"\u2500".repeat(terminalColumns)}</Text>
+          <Box paddingLeft={1}>
+            <Text color="green" bold>
+              you{">"}
             {" "}
           </Text>
           <TextInput
@@ -1863,6 +1840,8 @@ function ChatApp({
             onSubmit={handleSubmit}
             focus={inputFocused}
           />
+          </Box>
+          <Text dimColor>{"\u2500".repeat(terminalColumns)}</Text>
         </Box>
       ) : null}
     </Box>

package/src/lib/aws.ts

@@ -1,4 +1,3 @@
-import { spawn as spawnChild } from "child_process";
 import { randomBytes } from "crypto";
 import { existsSync, mkdirSync, unlinkSync, writeFileSync } from "fs";
 import { homedir, tmpdir, userInfo } from "os";
@@ -224,6 +223,7 @@ export async function launchInstance(
   userDataPath: string,
   species: string,
   region: string,
+  hatchedBy?: string,
 ): Promise<string> {
   const blockDeviceMappings = JSON.stringify([
     {
@@ -231,14 +231,18 @@ export async function launchInstance(
       Ebs: { VolumeSize: 50, VolumeType: "gp3" },
     },
   ]);
+  const tags = [
+    { Key: "Name", Value: name },
+    { Key: "vellum-assistant", Value: "true" },
+    { Key: "species", Value: species },
+  ];
+  if (hatchedBy) {
+    tags.push({ Key: "hatched-by", Value: hatchedBy });
+  }
   const tagSpecifications = JSON.stringify([
     {
       ResourceType: "instance",
-      Tags: [
-        { Key: "Name", Value: name },
-        { Key: "vellum-assistant", Value: "true" },
-        { Key: "species", Value: species },
-      ],
+      Tags: tags,
     },
   ]);
 
@@ -398,6 +402,7 @@ export async function hatchAws(
 
     const sshUser = userInfo().username;
     const bearerToken = randomBytes(32).toString("hex");
+    const hatchedBy = process.env.VELLUM_HATCHED_BY;
     const anthropicApiKey = process.env.ANTHROPIC_API_KEY;
     if (!anthropicApiKey) {
       console.error("Error: ANTHROPIC_API_KEY environment variable is not set.");
@@ -442,6 +447,7 @@ export async function hatchAws(
         startupScriptPath,
         species,
         region,
+        hatchedBy,
       );
     } finally {
       try {
@@ -606,33 +612,14 @@ export async function retireInstance(
 
   console.log(`\u{1F5D1}\ufe0f  Terminating AWS instance ${name} (${instanceId})\n`);
 
-  const child = spawnChild(
-    "aws",
-    [
-      "ec2",
-      "terminate-instances",
-      "--instance-ids",
-      instanceId,
-      "--region",
-      region,
-    ],
-    { stdio: "inherit" },
-  );
-
-  await new Promise<void>((resolve, reject) => {
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(
-          new Error(
-            `aws ec2 terminate-instances exited with code ${code}`,
-          ),
-        );
-      }
-    });
-    child.on("error", reject);
-  });
+  await exec("aws", [
+    "ec2",
+    "terminate-instances",
+    "--instance-ids",
+    instanceId,
+    "--region",
+    region,
+  ]);
 
   console.log(`\u2705 Instance ${name} (${instanceId}) terminated.`);
 }

package/src/lib/gcp.ts

@@ -1,6 +1,5 @@
-import { spawn } from "child_process";
 import { randomBytes } from "crypto";
-import { existsSync, mkdtempSync, rmSync, unlinkSync, writeFileSync } from "fs";
+import { existsSync, unlinkSync, writeFileSync } from "fs";
 import { tmpdir, userInfo } from "os";
 import { join } from "path";
 
@@ -11,26 +10,6 @@ import type { Species } from "./constants";
 import { generateRandomSuffix } from "./random-name";
 import { exec, execOutput } from "./step-runner";
 
-export async function activateServiceAccount(): Promise<(() => void) | null> {
-  const account = process.env.GCP_ACCOUNT_EMAIL;
-  const keyFile = process.env.GOOGLE_APPLICATION_CREDENTIALS;
-  if (!account || !keyFile) return null;
-
-  const gcpConfigDir = mkdtempSync(join(tmpdir(), "vellum-gcloud-"));
-  process.env.CLOUDSDK_CONFIG = gcpConfigDir;
-  await exec("gcloud", [
-    "auth",
-    "activate-service-account",
-    account,
-    `--key-file=${keyFile}`,
-  ]);
-
-  return () => {
-    delete process.env.CLOUDSDK_CONFIG;
-    try { rmSync(gcpConfigDir, { recursive: true, force: true }); } catch {}
-  };
-}
-
 export async function getActiveProject(): Promise<string> {
   const output = await execOutput("gcloud", [
     "config",
@@ -532,7 +511,6 @@ export async function hatchGcp(
 ): Promise<void> {
   const startTime = Date.now();
   const account = process.env.GCP_ACCOUNT_EMAIL;
-  const cleanupServiceAccount = await activateServiceAccount();
 
   try {
     const project = process.env.GCP_PROJECT ?? (await getActiveProject());
@@ -576,6 +554,7 @@ export async function hatchGcp(
 
     const sshUser = userInfo().username;
     const bearerToken = randomBytes(32).toString("hex");
+    const hatchedBy = process.env.VELLUM_HATCHED_BY;
     const anthropicApiKey = process.env.ANTHROPIC_API_KEY;
     if (!anthropicApiKey) {
       console.error("Error: ANTHROPIC_API_KEY environment variable is not set.");
@@ -607,7 +586,7 @@ export async function hatchGcp(
         "--boot-disk-size=50GB",
         "--boot-disk-type=pd-standard",
         `--metadata-from-file=startup-script=${startupScriptPath}`,
-        `--labels=species=${species},vellum-assistant=true`,
+        `--labels=species=${species},vellum-assistant=true${hatchedBy ? `,hatched-by=${hatchedBy.toLowerCase().replace(/[^a-z0-9_-]/g, "_")}` : ""}`,
         "--tags=vellum-assistant",
         "--no-service-account",
         "--no-scopes",
@@ -716,8 +695,6 @@ export async function hatchGcp(
   } catch (error) {
     console.error("\u274c Error:", error instanceof Error ? error.message : error);
     process.exit(1);
-  } finally {
-    cleanupServiceAccount?.();
   }
 }
 
@@ -772,30 +749,15 @@ export async function retireInstance(
 
   console.log(`\u{1F5D1}\ufe0f  Deleting GCP instance ${name}\n`);
 
-  const child = spawn(
-    "gcloud",
-    [
-      "compute",
-      "instances",
-      "delete",
-      name,
-      `--project=${project}`,
-      `--zone=${zone}`,
-      "--quiet",
-    ],
-    { stdio: "inherit" },
-  );
-
-  await new Promise<void>((resolve, reject) => {
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(new Error(`gcloud instance delete exited with code ${code}`));
-      }
-    });
-    child.on("error", reject);
-  });
+  await exec("gcloud", [
+    "compute",
+    "instances",
+    "delete",
+    name,
+    `--project=${project}`,
+    `--zone=${zone}`,
+    "--quiet",
+  ]);
 
   console.log(`\u2705 Instance ${name} deleted.`);
 }

package/src/lib/local.ts

@@ -4,7 +4,8 @@ import { createRequire } from "module";
 import { homedir } from "os";
 import { dirname, join } from "path";
 
-import { GATEWAY_PORT } from "../lib/constants";
+import { loadAllAssistants, loadLatestAssistant } from "./assistant-config.js";
+import { GATEWAY_PORT } from "./constants.js";
 
 const _require = createRequire(import.meta.url);
 
@@ -286,24 +287,41 @@ export async function startGateway(): Promise<string> {
 
   console.log("🌐 Starting gateway...");
   const gatewayDir = resolveGatewayDir();
+  // Only auto-configure default routing when the workspace has exactly one
+  // assistant.  In multi-assistant deployments, falling back to "default"
+  // would silently deliver unmapped Telegram chats to whichever assistant was
+  // most recently hatched — keep the "reject" policy instead.
+  const assistants = loadAllAssistants();
+  const isSingleAssistant = assistants.length === 1;
+
   const gatewayEnv: Record<string, string> = {
     ...process.env as Record<string, string>,
     GATEWAY_RUNTIME_PROXY_ENABLED: "true",
     GATEWAY_RUNTIME_PROXY_REQUIRE_AUTH: "false",
     RUNTIME_HTTP_PORT: process.env.RUNTIME_HTTP_PORT || "7821",
   };
+
+  if (process.env.GATEWAY_UNMAPPED_POLICY) {
+    gatewayEnv.GATEWAY_UNMAPPED_POLICY = process.env.GATEWAY_UNMAPPED_POLICY;
+  } else if (isSingleAssistant) {
+    gatewayEnv.GATEWAY_UNMAPPED_POLICY = "default";
+  }
+
+  if (process.env.GATEWAY_DEFAULT_ASSISTANT_ID) {
+    gatewayEnv.GATEWAY_DEFAULT_ASSISTANT_ID = process.env.GATEWAY_DEFAULT_ASSISTANT_ID;
+  } else if (isSingleAssistant) {
+    gatewayEnv.GATEWAY_DEFAULT_ASSISTANT_ID =
+      assistants[0].assistantId || loadLatestAssistant()?.assistantId || "default";
+  }
   const workspaceIngressPublicBaseUrl = readWorkspaceIngressPublicBaseUrl();
   const ingressPublicBaseUrl =
     workspaceIngressPublicBaseUrl
-    ?? normalizeIngressUrl(process.env.INGRESS_PUBLIC_BASE_URL);
+    ?? normalizeIngressUrl(process.env.INGRESS_PUBLIC_BASE_URL)
+    ?? publicUrl;
   if (ingressPublicBaseUrl) {
     gatewayEnv.INGRESS_PUBLIC_BASE_URL = ingressPublicBaseUrl;
     console.log(`   Ingress URL: ${ingressPublicBaseUrl}`);
-    if (!workspaceIngressPublicBaseUrl) {
-      console.log("   (using INGRESS_PUBLIC_BASE_URL env fallback)");
-    }
   }
-  if (publicUrl) gatewayEnv.GATEWAY_PUBLIC_URL = publicUrl;
 
   const gateway = spawn("bun", ["run", "src/index.ts"], {
     cwd: gatewayDir,