@desplega.ai/agent-swarm 2.6.0 → 2.7.1

package/src/tests/comb-links.test.ts

@@ -1,7 +1,12 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import { buildCitationUrl } from "../be/task-citations";
 import type { TaskAttachment } from "../types";
-import { buildAgentFsLiveUrl, buildCombFileUrl } from "../utils/constants";
+import {
+  buildAgentFsLiveUrl,
+  buildCombFileUrl,
+  readAgentFsLinkTarget,
+  resolveAgentFsLinkBase,
+} from "../utils/constants";
 import { taskAttachmentDisplayUrl } from "../utils/task-attachment-links";
 
 const ENV_KEYS = [
@@ -10,6 +15,7 @@ const ENV_KEYS = [
   "DASHBOARD_URL",
   "AGENT_FS_API_URL",
   "AGENT_FS_LIVE_URL",
+  "AGENT_FS_LINK_TARGET",
   "AGENT_FS_DEFAULT_ORG_ID",
   "AGENT_FS_DEFAULT_DRIVE_ID",
 ] as const;
@@ -160,3 +166,75 @@ describe("agent-fs citations", () => {
     ).toBe(COMB);
   });
 });
+
+describe("AGENT_FS_LINK_TARGET", () => {
+  test("unset: no target, and attachments keep the automatic choice", () => {
+    expect(readAgentFsLinkTarget()).toBeNull();
+    expect(resolveAgentFsLinkBase("attachment")).toBeNull();
+    expect(resolveAgentFsLinkBase("prompt")).toBeNull();
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(LIVE);
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(COMB);
+  });
+
+  test("live on a Comb + APP_URL install: the live URL", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274";
+    process.env.AGENT_FS_LINK_TARGET = " Live ";
+    expect(readAgentFsLinkTarget()).toBe("live");
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(LIVE);
+    expect(resolveAgentFsLinkBase("prompt")).toBe("https://live.example.test");
+  });
+
+  test("dashboard with Comb on and APP_URL: the dashboard URL", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274/";
+    process.env.AGENT_FS_LINK_TARGET = "dashboard";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(COMB);
+    expect(resolveAgentFsLinkBase("prompt")).toBe("http://localhost:5274");
+  });
+
+  test("dashboard with Comb off: attachments use the live URL, the prompt still uses APP_URL", () => {
+    process.env.APP_URL = "http://localhost:5274";
+    process.env.AGENT_FS_LINK_TARGET = "dashboard";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(LIVE);
+    expect(resolveAgentFsLinkBase("attachment")).toBe("https://live.example.test");
+    expect(resolveAgentFsLinkBase("prompt")).toBe("http://localhost:5274");
+  });
+
+  test("dashboard without APP_URL: the live URL on both surfaces", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.AGENT_FS_LINK_TARGET = "dashboard";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(LIVE);
+    expect(resolveAgentFsLinkBase("prompt")).toBe("https://live.example.test");
+  });
+
+  test("an invalid or blank value counts as unset", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274";
+    for (const value of ["Dashboard2", "comb", "", "   "]) {
+      process.env.AGENT_FS_LINK_TARGET = value;
+      expect(readAgentFsLinkTarget()).toBeNull();
+      expect(resolveAgentFsLinkBase("prompt")).toBeNull();
+      expect(taskAttachmentDisplayUrl(agentFsAttachment())).toBe(COMB);
+    }
+  });
+
+  test("comb: false still links to the live URL", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274";
+    process.env.AGENT_FS_LINK_TARGET = "dashboard";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment(), { comb: false })).toBe(LIVE);
+  });
+
+  test("a bad path still falls back to agent-fs:<path>", () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.APP_URL = "http://localhost:5274";
+    process.env.AGENT_FS_LINK_TARGET = "dashboard";
+    expect(taskAttachmentDisplayUrl(agentFsAttachment({ path: "../x" }))).toBe("agent-fs:../x");
+    expect(
+      taskAttachmentDisplayUrl(agentFsAttachment({ orgId: undefined, driveId: undefined })),
+    ).toBe("agent-fs:comb-qa/notes.md");
+  });
+});

package/src/tests/comb-status.test.ts

@@ -15,6 +15,9 @@ const ENV_KEYS = [
   "AGENT_FS_DEFAULT_DRIVE_ID",
   "API_AGENT_FS_API_KEY",
   "AGENT_FS_API_KEY",
+  "AGENT_FS_PROXY",
+  "PUBLIC_MCP_BASE_URL",
+  "MCP_BASE_URL",
 ];
 const savedEnv = new Map<string, string | undefined>();
 
@@ -92,6 +95,47 @@ describe("/status agent_fs.comb", () => {
     expect((await comb()).api_url).toBe("https://files.example.com");
   });
 
+  test("AGENT_FS_PROXY on and a blank public URL: api_url is <PUBLIC_MCP_BASE_URL>/agentfs", async () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.AGENT_FS_API_URL = "http://agent-fs:7433";
+    process.env.MCP_BASE_URL = "http://swarm-api:3013";
+    process.env.PUBLIC_MCP_BASE_URL = "https://swarm.example.com/";
+    for (const value of ["true", " TRUE ", "1"]) {
+      process.env.AGENT_FS_PROXY = value;
+      expect((await comb()).api_url).toBe("https://swarm.example.com/agentfs");
+    }
+    process.env.AGENT_FS_PUBLIC_URL = "  ";
+    expect((await comb()).api_url).toBe("https://swarm.example.com/agentfs");
+    // No public URL: falls back to MCP_BASE_URL.
+    delete process.env.PUBLIC_MCP_BASE_URL;
+    expect((await comb()).api_url).toBe("http://swarm-api:3013/agentfs");
+  });
+
+  test("AGENT_FS_PROXY on: an explicit AGENT_FS_PUBLIC_URL still wins", async () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.AGENT_FS_API_URL = "http://agent-fs:7433";
+    process.env.PUBLIC_MCP_BASE_URL = "https://swarm.example.com";
+    process.env.AGENT_FS_PROXY = "true";
+    process.env.AGENT_FS_PUBLIC_URL = "https://files.example.com/";
+    expect((await comb()).api_url).toBe("https://files.example.com");
+  });
+
+  test("AGENT_FS_PROXY off or without AGENT_FS_API_URL: api_url unchanged", async () => {
+    process.env.COMB_ENABLED = "true";
+    process.env.AGENT_FS_API_URL = "http://agent-fs:7433";
+    process.env.PUBLIC_MCP_BASE_URL = "https://swarm.example.com";
+    for (const value of [undefined, "false", "0", ""]) {
+      if (value === undefined) delete process.env.AGENT_FS_PROXY;
+      else process.env.AGENT_FS_PROXY = value;
+      expect((await comb()).api_url).toBe("http://agent-fs:7433");
+    }
+    process.env.AGENT_FS_PROXY = "true";
+    delete process.env.AGENT_FS_API_URL;
+    const result = await comb();
+    expect(result.enabled).toBe(false);
+    expect(result.api_url).toBeNull();
+  });
+
   test("ids come from AGENT_FS_DEFAULT_*, and live_url from AGENT_FS_LIVE_URL", async () => {
     process.env.COMB_ENABLED = "true";
     process.env.AGENT_FS_API_URL = "http://agent-fs:7433";