@desplega.ai/agent-swarm 1.87.0 → 1.88.0

package/src/tests/claude-adapter.test.ts

@@ -246,6 +246,23 @@ describe("mergeMcpConfig (issue #369)", () => {
     const merged = mergeMcpConfig({ mcpServers: {} }, {}, TASK_ID);
     expect(Object.keys(merged.mcpServers)).toHaveLength(0);
   });
+
+  test("preserves a context-mode entry through the merge", () => {
+    const base = {
+      mcpServers: {
+        "agent-swarm": {
+          type: "http",
+          url: "http://localhost:3013/mcp",
+          headers: { Authorization: "Bearer KEY", "X-Agent-ID": "a1" },
+        },
+        "plugin_context-mode_context-mode": { command: "context-mode" },
+      },
+    };
+    const merged = mergeMcpConfig(base, null, TASK_ID);
+    expect(merged.mcpServers["plugin_context-mode_context-mode"]).toEqual({
+      command: "context-mode",
+    });
+  });
 });
 
 describe("createSessionMcpConfig", () => {
@@ -323,7 +340,13 @@ describe("createSessionMcpConfig", () => {
     const written = await readWritten(path!);
     expect(written.mcpServers["agent-swarm"]).toBeDefined();
     expect(written.mcpServers.Datadog).toBeDefined();
-    expect(Object.keys(written.mcpServers).sort()).toEqual(["Datadog", "agent-swarm"]);
+    // context-mode is injected by default (see CONTEXT_MODE_DISABLED gate); the
+    // two differently-named .mcp.json servers still merge alongside it.
+    expect(Object.keys(written.mcpServers).sort()).toEqual([
+      "Datadog",
+      "agent-swarm",
+      "plugin_context-mode_context-mode",
+    ]);
   });
 
   test("ancestor wins over repo-local on agent-swarm key conflict", async () => {
@@ -402,4 +425,66 @@ describe("createSessionMcpConfig", () => {
     const written = await readWritten(path!);
     expect(written.mcpServers["from-api"]).toBeDefined();
   });
+
+  test("includes context-mode entry when CONTEXT_MODE_DISABLED is unset", async () => {
+    const prev = process.env.CONTEXT_MODE_DISABLED;
+    delete process.env.CONTEXT_MODE_DISABLED;
+    try {
+      await writeFile(
+        join(sandbox, ".mcp.json"),
+        JSON.stringify({
+          mcpServers: {
+            "agent-swarm": {
+              type: "http",
+              url: "http://swarm/mcp",
+              headers: { Authorization: "Bearer SWARM", "X-Agent-ID": "a1" },
+            },
+          },
+        }),
+      );
+      const cwd = join(sandbox, "repos", "foo");
+      await mkdir(cwd, { recursive: true });
+
+      const path = await createSessionMcpConfig(cwd, "task-ctx-on");
+      const written = await readWritten(path!);
+      expect(written.mcpServers["plugin_context-mode_context-mode"]).toEqual({
+        command: "context-mode",
+      });
+      // Coexists with the swarm entry.
+      expect(written.mcpServers["agent-swarm"]).toBeDefined();
+    } finally {
+      if (prev === undefined) delete process.env.CONTEXT_MODE_DISABLED;
+      else process.env.CONTEXT_MODE_DISABLED = prev;
+    }
+  });
+
+  test("excludes context-mode entry when CONTEXT_MODE_DISABLED='true'", async () => {
+    const prev = process.env.CONTEXT_MODE_DISABLED;
+    process.env.CONTEXT_MODE_DISABLED = "true";
+    try {
+      await writeFile(
+        join(sandbox, ".mcp.json"),
+        JSON.stringify({
+          mcpServers: {
+            "agent-swarm": {
+              type: "http",
+              url: "http://swarm/mcp",
+              headers: { Authorization: "Bearer SWARM", "X-Agent-ID": "a1" },
+            },
+          },
+        }),
+      );
+      const cwd = join(sandbox, "repos", "foo");
+      await mkdir(cwd, { recursive: true });
+
+      const path = await createSessionMcpConfig(cwd, "task-ctx-off");
+      const written = await readWritten(path!);
+      expect(written.mcpServers["plugin_context-mode_context-mode"]).toBeUndefined();
+      // The swarm entry is still present.
+      expect(written.mcpServers["agent-swarm"]).toBeDefined();
+    } finally {
+      if (prev === undefined) delete process.env.CONTEXT_MODE_DISABLED;
+      else process.env.CONTEXT_MODE_DISABLED = prev;
+    }
+  });
 });

package/src/tests/codex-adapter.test.ts

@@ -872,9 +872,21 @@ describe("computeCodexCostUsd", () => {
 describe("buildCodexConfig", () => {
   // Save and restore the global fetch so we don't leak mocks between tests.
   const originalFetch = globalThis.fetch;
+  // These tests assert the EXACT set of mcp_servers keys, which is only the
+  // installed-server merge logic. Disable the always-on context-mode entry so
+  // those exact-key assertions stay valid; a dedicated block below verifies
+  // the context-mode + features behavior. Save/restore the env to avoid leaks.
+  let prevContextModeDisabled: string | undefined;
+
+  beforeEach(() => {
+    prevContextModeDisabled = process.env.CONTEXT_MODE_DISABLED;
+    process.env.CONTEXT_MODE_DISABLED = "true";
+  });
 
   afterEach(() => {
     globalThis.fetch = originalFetch;
+    if (prevContextModeDisabled === undefined) delete process.env.CONTEXT_MODE_DISABLED;
+    else process.env.CONTEXT_MODE_DISABLED = prevContextModeDisabled;
   });
 
   // Helper: build a ProviderSessionConfig pointed at a mock endpoint.
@@ -1098,6 +1110,83 @@ describe("buildCodexConfig", () => {
   });
 });
 
+// ─── Phase 3: buildCodexConfig — context-mode MCP + hook feature flags ───────
+
+describe("buildCodexConfig — context-mode + features", () => {
+  const originalFetch = globalThis.fetch;
+  // Explicitly own CONTEXT_MODE_DISABLED here. Save the ambient value up front
+  // and restore it after every test so we never leak the mutation to siblings.
+  let prevContextModeDisabled: string | undefined;
+
+  beforeEach(() => {
+    prevContextModeDisabled = process.env.CONTEXT_MODE_DISABLED;
+  });
+
+  afterEach(() => {
+    globalThis.fetch = originalFetch;
+    if (prevContextModeDisabled === undefined) delete process.env.CONTEXT_MODE_DISABLED;
+    else process.env.CONTEXT_MODE_DISABLED = prevContextModeDisabled;
+  });
+
+  function cfg(overrides: Partial<ProviderSessionConfig> = {}): ProviderSessionConfig {
+    return {
+      prompt: "hello",
+      systemPrompt: "",
+      model: "gpt-5.4",
+      role: "worker",
+      agentId: "agent-mcp-test",
+      taskId: "task-mcp-test",
+      apiUrl: "http://test.invalid",
+      apiKey: "test-key",
+      cwd: "",
+      logFile: `/tmp/codex-ctx-test-${Date.now()}-${Math.random().toString(36).slice(2)}.log`,
+      ...overrides,
+    };
+  }
+
+  function stubFetch(body: unknown, status = 200): typeof globalThis.fetch {
+    return async (): Promise<Response> => {
+      return new Response(JSON.stringify(body), {
+        status,
+        headers: { "Content-Type": "application/json" },
+      });
+    };
+  }
+
+  test("includes the 'context-mode' mcp_servers entry by default", async () => {
+    delete process.env.CONTEXT_MODE_DISABLED;
+    globalThis.fetch = stubFetch({ servers: [], total: 0 });
+    const merged = await buildCodexConfig(cfg(), "gpt-5.4", () => {});
+    const mcp = merged.mcp_servers as Record<string, Record<string, unknown>>;
+
+    expect(Object.keys(mcp).sort()).toEqual(["agent-swarm", "context-mode"]);
+    expect(mcp["context-mode"]?.command).toBe("context-mode");
+    expect(mcp["context-mode"]?.enabled).toBe(true);
+    expect(mcp["context-mode"]?.startup_timeout_sec).toBe(30);
+    expect(mcp["context-mode"]?.tool_timeout_sec).toBe(120);
+  });
+
+  test("excludes the 'context-mode' entry when CONTEXT_MODE_DISABLED=true", async () => {
+    process.env.CONTEXT_MODE_DISABLED = "true";
+    globalThis.fetch = stubFetch({ servers: [], total: 0 });
+    const merged = await buildCodexConfig(cfg(), "gpt-5.4", () => {});
+    const mcp = merged.mcp_servers as Record<string, Record<string, unknown>>;
+
+    expect(Object.keys(mcp)).toEqual(["agent-swarm"]);
+    expect(mcp["context-mode"]).toBeUndefined();
+  });
+
+  test("sets features.hooks and features.plugin_hooks to true", async () => {
+    delete process.env.CONTEXT_MODE_DISABLED;
+    globalThis.fetch = stubFetch({ servers: [], total: 0 });
+    const merged = await buildCodexConfig(cfg(), "gpt-5.4", () => {});
+
+    const features = merged.features as Record<string, unknown>;
+    expect(features.hooks).toBe(true);
+    expect(features.plugin_hooks).toBe(true);
+  });
+});
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Phase 3 — session-end summarization
 // ─────────────────────────────────────────────────────────────────────────────