@vellumai/cli 0.11.3 → 0.11.4-dev.202608190019.b94dbf2

package/src/__tests__/pair.test.ts

@@ -382,14 +382,6 @@ describe("pair command", () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string, init?: RequestInit) => {
       calls.push([url, init]);
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         return new Response(
           JSON.stringify({
@@ -430,9 +422,9 @@ describe("pair command", () => {
       globalThis.fetch = origFetch;
     }
 
-    expect(calls).toHaveLength(2);
-    expect(calls[1][0]).toBe(`${LOCAL_URL}/v1/remote-web/pairing-challenge`);
-    expect(JSON.parse(calls[1][1]?.body as string)).toEqual({
+    expect(calls).toHaveLength(1);
+    expect(calls[0][0]).toBe(`${LOCAL_URL}/v1/remote-web/pairing-challenge`);
+    expect(JSON.parse(calls[0][1]?.body as string)).toEqual({
       publicBaseUrl: "https://abc123.ngrok.app/assistant-123",
     });
 
@@ -449,58 +441,6 @@ describe("pair command", () => {
     expect(logs.join("\n")).not.toContain("refresh");
   });
 
-  test("--web refuses when the web remote ingress feature flag is off", async () => {
-    const calls: Array<[string, RequestInit | undefined]> = [];
-    const origFetch = globalThis.fetch;
-    globalThis.fetch = (async (url: string, init?: RequestInit) => {
-      calls.push([url, init]);
-      return new Response(
-        JSON.stringify({
-          flags: [{ key: "web-remote-ingress", enabled: false }],
-        }),
-        { status: 200, headers: { "content-type": "application/json" } },
-      );
-    }) as unknown as typeof fetch;
-
-    const errors: string[] = [];
-    const errSpy = spyOn(console, "error").mockImplementation(
-      (...a: unknown[]) => {
-        errors.push(a.join(" "));
-      },
-    );
-    const exitSpy = spyOn(process, "exit").mockImplementation(((
-      code?: number,
-    ) => {
-      throw new Error(`exit:${code}`);
-    }) as never);
-
-    process.argv = [
-      "bun",
-      "vellum",
-      "pair",
-      "--web",
-      "--url",
-      "https://abc123.ngrok.app",
-    ];
-    let exited = false;
-    try {
-      await pair();
-    } catch (e) {
-      exited = (e as Error).message === "exit:1";
-    } finally {
-      errSpy.mockRestore();
-      exitSpy.mockRestore();
-      globalThis.fetch = origFetch;
-    }
-
-    expect(exited).toBe(true);
-    expect(errors.join("\n")).toContain("web-remote-ingress");
-    expect(calls).toHaveLength(1);
-    expect(calls[0][0]).toBe(
-      `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`,
-    );
-  });
-
   test("--web-approve approves a browser pairing code over loopback", async () => {
     writeFileSync(
       join(testDir, ".vellum.lock.json"),
@@ -521,14 +461,6 @@ describe("pair command", () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string, init?: RequestInit) => {
       calls.push([url, init]);
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-verification`) {
         return new Response(
           JSON.stringify({
@@ -564,9 +496,9 @@ describe("pair command", () => {
       globalThis.fetch = origFetch;
     }
 
-    expect(calls).toHaveLength(2);
-    expect(calls[1][0]).toBe(`${LOCAL_URL}/v1/remote-web/pairing-verification`);
-    expect(JSON.parse(calls[1][1]?.body as string)).toEqual({
+    expect(calls).toHaveLength(1);
+    expect(calls[0][0]).toBe(`${LOCAL_URL}/v1/remote-web/pairing-verification`);
+    expect(JSON.parse(calls[0][1]?.body as string)).toEqual({
       userCode: "ABCD-EFGH",
     });
     expect(JSON.parse(logs.join("\n"))).toEqual({
@@ -581,14 +513,6 @@ describe("pair command", () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string, init?: RequestInit) => {
       calls.push([url, init]);
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         return new Response(
           JSON.stringify({
@@ -637,18 +561,17 @@ describe("pair command", () => {
       globalThis.fetch = origFetch;
     }
 
-    // Flag check → create challenge → approve it, all over loopback. The
+    // Create challenge → approve it, all over loopback. The
     // approval is the whole point: running the CLI on the host IS the approval,
     // so the scan alone completes pairing.
     expect(calls.map((c) => c[0])).toEqual([
-      `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`,
       `${LOCAL_URL}/v1/remote-web/pairing-challenge`,
       `${LOCAL_URL}/v1/remote-web/pairing-verification`,
     ]);
-    expect(JSON.parse(calls[1][1]?.body as string)).toEqual({
+    expect(JSON.parse(calls[0][1]?.body as string)).toEqual({
       publicBaseUrl: "https://pair.example.ts.net",
     });
-    expect(JSON.parse(calls[2][1]?.body as string)).toEqual({
+    expect(JSON.parse(calls[1][1]?.body as string)).toEqual({
       userCode: "ABCD-EFGH",
     });
 
@@ -669,14 +592,6 @@ describe("pair command", () => {
   test("--qr renders a QR and prints the fallback URL and expiry", async () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         return new Response(
           JSON.stringify({
@@ -903,59 +818,6 @@ describe("pair command", () => {
     expect(fetchCalled).toBe(false);
   });
 
-  test("--qr refuses when the web remote ingress feature flag is off", async () => {
-    const calls: Array<[string, RequestInit | undefined]> = [];
-    const origFetch = globalThis.fetch;
-    globalThis.fetch = (async (url: string, init?: RequestInit) => {
-      calls.push([url, init]);
-      return new Response(
-        JSON.stringify({
-          flags: [{ key: "web-remote-ingress", enabled: false }],
-        }),
-        { status: 200, headers: { "content-type": "application/json" } },
-      );
-    }) as unknown as typeof fetch;
-
-    const errors: string[] = [];
-    const errSpy = spyOn(console, "error").mockImplementation(
-      (...a: unknown[]) => {
-        errors.push(a.join(" "));
-      },
-    );
-    const exitSpy = spyOn(process, "exit").mockImplementation(((
-      code?: number,
-    ) => {
-      throw new Error(`exit:${code}`);
-    }) as never);
-
-    process.argv = [
-      "bun",
-      "vellum",
-      "pair",
-      "--qr",
-      "--url",
-      "https://pair.example.ts.net",
-    ];
-    let exited = false;
-    try {
-      await pair();
-    } catch (e) {
-      exited = (e as Error).message === "exit:1";
-    } finally {
-      errSpy.mockRestore();
-      exitSpy.mockRestore();
-      globalThis.fetch = origFetch;
-    }
-
-    // Only the flag check runs; no challenge is minted when the flag is off.
-    expect(exited).toBe(true);
-    expect(errors.join("\n")).toContain("web-remote-ingress");
-    expect(calls).toHaveLength(1);
-    expect(calls[0][0]).toBe(
-      `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`,
-    );
-  });
-
   test("buildAppConnectUrl composes and encodes the connect link", () => {
     expect(
       buildAppConnectUrl(
@@ -1004,14 +866,6 @@ describe("pair command", () => {
   test("--qr --app emits an app connect URL alongside the browser URL", async () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         return new Response(
           JSON.stringify({
@@ -1079,14 +933,6 @@ describe("pair command", () => {
   test("--qr --app --label overrides the assistant name in the connect link", async () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         return new Response(
           JSON.stringify({
@@ -1205,14 +1051,6 @@ describe("pair command", () => {
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string, init?: RequestInit) => {
       calls.push(url);
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         // The minted challenge must advertise the entry's recorded URL.
         expect(JSON.parse(init?.body as string)).toEqual({
@@ -1272,14 +1110,6 @@ describe("pair command", () => {
 
     const origFetch = globalThis.fetch;
     globalThis.fetch = (async (url: string, init?: RequestInit) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
       if (url === `${LOCAL_URL}/v1/remote-web/pairing-challenge`) {
         expect(JSON.parse(init?.body as string)).toEqual({
           publicBaseUrl: "https://explicit.example.ts.net",
@@ -1338,15 +1168,7 @@ describe("pair command", () => {
 
     const origFetch = globalThis.fetch;
     let minted = false;
-    globalThis.fetch = (async (url: string) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
+    globalThis.fetch = (async () => {
       minted = true;
       return new Response("{}", { status: 200 });
     }) as unknown as typeof fetch;
@@ -1387,15 +1209,7 @@ describe("pair command", () => {
 
     const origFetch = globalThis.fetch;
     let minted = false;
-    globalThis.fetch = (async (url: string) => {
-      if (url === `${LOCAL_URL}/v1/assistants/pair-test/feature-flags`) {
-        return new Response(
-          JSON.stringify({
-            flags: [{ key: "web-remote-ingress", enabled: true }],
-          }),
-          { status: 200, headers: { "content-type": "application/json" } },
-        );
-      }
+    globalThis.fetch = (async () => {
       minted = true;
       return new Response("{}", { status: 200 });
     }) as unknown as typeof fetch;

package/src/__tests__/retire-archive.test.ts

@@ -1,5 +1,10 @@
 import { describe, test, expect } from "bun:test";
-import { validateAssistantName } from "../lib/retire-archive.js";
+import { win32 } from "node:path";
+
+import {
+  resolveRetiredFilePath,
+  validateAssistantName,
+} from "../lib/retire-archive.js";
 
 describe("validateAssistantName", () => {
   test("accepts valid names", () => {
@@ -32,3 +37,10 @@ describe("validateAssistantName", () => {
     expect(() => validateAssistantName(".")).toThrow("Invalid assistant name");
   });
 });
+
+test("accepts a Windows archive path inside the retired directory", () => {
+  const retiredDir = "C:\\Users\\Example User\\AppData\\Local\\Vellum\\retired";
+  expect(
+    resolveRetiredFilePath("assistant", "tar.gz", retiredDir, "win32"),
+  ).toBe(win32.join(retiredDir, "assistant.tar.gz"));
+});

package/src/__tests__/retire-local.test.ts

@@ -12,7 +12,12 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
-import type { AssistantEntry } from "../lib/assistant-config.js";
+import {
+  getDaemonPidPath,
+  type AssistantEntry,
+} from "../lib/assistant-config.js";
+import { getLockfilePath } from "../lib/environments/paths.js";
+import { getCurrentEnvironment } from "../lib/environments/resolve.js";
 
 const testDir = mkdtempSync(join(tmpdir(), "retire-local-test-"));
 const originalLockfileDir = process.env.VELLUM_LOCKFILE_DIR;
@@ -31,7 +36,7 @@ const stopProcessByPidFileMock = mock(
   async (_pidFile: string, _label: string): Promise<boolean> => true,
 );
 const stopOrphanedDaemonProcessesMock = mock(
-  async (): Promise<boolean> => false,
+  async (_excludePids?: ReadonlySet<string>): Promise<boolean> => false,
 );
 const stopIngressNginxMock = mock(async (): Promise<boolean> => false);
 
@@ -60,7 +65,7 @@ afterAll(() => {
   mock.module("../lib/retire-archive.js", () => realRetireArchive);
 });
 
-import { retireLocal } from "../lib/retire-local.js";
+import { getRetireArchiveCommand, retireLocal } from "../lib/retire-local.js";
 
 const instanceDir = join(testDir, "test-instance");
 const vellumDir = join(instanceDir, ".vellum");
@@ -82,7 +87,7 @@ function makeEntry(assistantId: string): AssistantEntry {
 
 function writeLockfile(entries: AssistantEntry[]): void {
   writeFileSync(
-    join(testDir, ".vellum.lock.json"),
+    getLockfilePath(getCurrentEnvironment()),
     JSON.stringify({ assistants: entries }, null, 2) + "\n",
   );
 }
@@ -174,4 +179,53 @@ describe("retireLocal — CES sibling stop", () => {
     );
     expect(cesStopCall).toBeDefined();
   });
+
+  test("protects other assistants during orphan cleanup", async () => {
+    const otherInstanceDir = join(testDir, "other-instance");
+    const otherEntry = makeEntry("other-assistant");
+    otherEntry.resources!.instanceDir = otherInstanceDir;
+    const otherPid = "4242";
+    const otherPidFile = getDaemonPidPath(otherEntry.resources);
+    mkdirSync(join(otherInstanceDir, ".vellum", "workspace"), {
+      recursive: true,
+    });
+    writeFileSync(otherPidFile, otherPid);
+    writeLockfile([makeEntry("test-assistant"), otherEntry]);
+    stopProcessByPidFileMock.mockImplementation(
+      async (_pidFile: string, label: string): Promise<boolean> =>
+        label !== "daemon",
+    );
+
+    await retireLocal("test-assistant", makeEntry("test-assistant"), {
+      progress: () => {},
+      log: () => {},
+      warn: () => {},
+      error: () => {},
+    });
+
+    expect(stopOrphanedDaemonProcessesMock).toHaveBeenCalledTimes(1);
+    const excludedPids = stopOrphanedDaemonProcessesMock.mock.calls[0]?.[0];
+    expect(excludedPids?.has(otherPid)).toBeTrue();
+  });
+});
+
+test("uses a Windows-native archive process", () => {
+  const archivePath =
+    "C:\\Users\\Example User\\Vellum\\retired\\assistant & data.tar.gz";
+  const stagingDir = `${archivePath}.staging`;
+  const archiveCommand = getRetireArchiveCommand(
+    archivePath,
+    stagingDir,
+    "win32",
+  );
+
+  expect(archiveCommand.command).toBe("powershell.exe");
+  expect(archiveCommand.args.join(" ")).toContain("tar.exe");
+  expect(archiveCommand.args.join(" ")).not.toContain(archivePath);
+  expect(archiveCommand.env).toMatchObject({
+    VELLUM_RETIRE_ARCHIVE_PATH: archivePath,
+    VELLUM_RETIRE_ARCHIVE_PARENT: "C:\\Users\\Example User\\Vellum\\retired",
+    VELLUM_RETIRE_STAGING_NAME: "assistant & data.tar.gz.staging",
+    VELLUM_RETIRE_STAGING_DIR: stagingDir,
+  });
 });

package/src/__tests__/tunnel.test.ts

@@ -238,20 +238,6 @@ describe("tunnel edge targeting", () => {
     mock.module("../lib/nginx-ingress.js", () => realNginxIngress);
   });
 
-  test("does not start ngrok when the edge flag lookup fails", async () => {
-    process.argv = ["bun", "vellum", "tunnel", "--provider", "ngrok"];
-    ensureTunnelEdgeMock.mockImplementation(realNginxIngress.ensureTunnelEdge);
-
-    const { exited, errors } = await runTunnelExpectingExit1();
-
-    expect(exited).toBe(true);
-    expect(errors).toContain(
-      "Could not verify the `web-remote-ingress` feature flag",
-    );
-    expect(runNgrokTunnelMock).not.toHaveBeenCalled();
-    expect(runCloudflareTunnelMock).not.toHaveBeenCalled();
-  });
-
   test("targets the edge port returned by ensureTunnelEdge for ngrok", async () => {
     const entry = makeLocalEntry();
     entry.runtimeUrl = "https://stale-tunnel.ngrok-free.dev";
@@ -660,20 +646,6 @@ describe("tunnel edge targeting", () => {
     expect(runTailscaleTunnelMock).not.toHaveBeenCalled();
   });
 
-  test("does not start cloudflared when the edge flag lookup fails", async () => {
-    process.argv = ["bun", "vellum", "tunnel", "--provider", "cloudflare"];
-    ensureTunnelEdgeMock.mockImplementation(realNginxIngress.ensureTunnelEdge);
-
-    const { exited, errors } = await runTunnelExpectingExit1();
-
-    expect(exited).toBe(true);
-    expect(errors).toContain(
-      "Could not verify the `web-remote-ingress` feature flag",
-    );
-    expect(runNgrokTunnelMock).not.toHaveBeenCalled();
-    expect(runCloudflareTunnelMock).not.toHaveBeenCalled();
-  });
-
   test("rejects an unknown --provider with a stale-CLI hint", async () => {
     process.argv = ["bun", "vellum", "tunnel", "--provider", "bogus"];