@vellumai/assistant 0.6.2 → 0.6.3

package/src/__tests__/subagent-spawn-tool-fork.test.ts

@@ -0,0 +1,411 @@
+import { describe, expect, test } from "bun:test";
+import { mock } from "bun:test";
+
+// Mock conversation-crud before importing tool executors that depend on it.
+mock.module("../memory/conversation-crud.js", () => ({
+  getConversationType: () => "default",
+  setConversationOriginChannelIfUnset: () => {},
+  updateConversationContextWindow: () => {},
+  deleteMessageById: () => {},
+  updateConversationTitle: () => {},
+  updateConversationUsage: () => {},
+  addMessage: () => ({ id: "mock-msg-id" }),
+  getConversation: () => ({
+    id: "conv-1",
+    contextSummary: null,
+    contextCompactedMessageCount: 0,
+    totalInputTokens: 0,
+    totalOutputTokens: 0,
+    totalEstimatedCost: 0,
+    title: null,
+  }),
+  provenanceFromTrustContext: () => ({
+    source: "user",
+    trustContext: undefined,
+  }),
+  getConversationOriginInterface: () => null,
+  getConversationOriginChannel: () => null,
+  getMessages: () => null,
+  createConversation: () => ({ id: "mock-conv" }),
+}));
+
+import type { Message } from "../providers/types.js";
+import { getSubagentManager } from "../subagent/index.js";
+import { executeSubagentSpawn } from "../tools/subagent/spawn.js";
+
+// ── Shared helpers ──────────────────────────────────────────────────
+
+function makeContext(
+  conversationId: string,
+  extras: Record<string, unknown> = {},
+) {
+  return {
+    workingDir: "/tmp",
+    conversationId,
+    trustClass: "guardian" as const,
+    ...extras,
+  } as import("../tools/types.js").ToolContext;
+}
+
+const FAKE_PARENT_MESSAGES: Message[] = [
+  {
+    role: "user",
+    content: [{ type: "text", text: "Hello from parent" }],
+  },
+  {
+    role: "assistant",
+    content: [{ type: "text", text: "Hello! How can I help?" }],
+  },
+];
+
+describe("subagent_spawn fork parameter", () => {
+  test("fork: true passes parent context to manager", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+    const originalResolve = manager.resolveParentConversation;
+
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "fork-subagent-id";
+    };
+
+    // Wire resolveParentConversation to return a fake parent conversation.
+    manager.resolveParentConversation = (id: string) => {
+      if (id === "parent-conv-1") {
+        return {
+          messages: FAKE_PARENT_MESSAGES,
+          getCurrentSystemPrompt: () => "You are a helpful assistant.",
+        } as any;
+      }
+      return undefined;
+    };
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Fork task",
+          objective: "Summarize our discussion",
+          fork: true,
+        },
+        makeContext("parent-conv-1", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      expect(capturedConfig!.fork).toBe(true);
+      expect(capturedConfig!.parentMessages).toEqual(FAKE_PARENT_MESSAGES);
+      expect(capturedConfig!.parentSystemPrompt).toBe(
+        "You are a helpful assistant.",
+      );
+      expect(capturedConfig!.parentConversationId).toBe("parent-conv-1");
+
+      // Verify the response includes isFork
+      const parsed = JSON.parse(result.content);
+      expect(parsed.isFork).toBe(true);
+      expect(parsed.subagentId).toBe("fork-subagent-id");
+      expect(parsed.status).toBe("pending");
+      expect(parsed.message).toContain("Forked subagent");
+    } finally {
+      manager.spawn = originalSpawn;
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("fork: true ignores role parameter", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+    const originalResolve = manager.resolveParentConversation;
+
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "fork-role-id";
+    };
+
+    manager.resolveParentConversation = (id: string) => {
+      if (id === "parent-conv-role") {
+        return {
+          messages: FAKE_PARENT_MESSAGES,
+          getCurrentSystemPrompt: () => "Parent prompt.",
+        } as any;
+      }
+      return undefined;
+    };
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Fork with role",
+          objective: "Do something",
+          fork: true,
+          role: "researcher", // should be ignored
+        },
+        makeContext("parent-conv-role", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      // When fork is true, role should NOT be passed to the manager config
+      expect(capturedConfig!.role).toBeUndefined();
+      expect(capturedConfig!.fork).toBe(true);
+    } finally {
+      manager.spawn = originalSpawn;
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("fork: true defaults sendResultToUser to false", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+    const originalResolve = manager.resolveParentConversation;
+
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "fork-silent-id";
+    };
+
+    manager.resolveParentConversation = (id: string) => {
+      if (id === "parent-conv-silent") {
+        return {
+          messages: FAKE_PARENT_MESSAGES,
+          getCurrentSystemPrompt: () => "Parent prompt.",
+        } as any;
+      }
+      return undefined;
+    };
+
+    try {
+      // No send_result_to_user specified — fork should default to false
+      const result = await executeSubagentSpawn(
+        {
+          label: "Silent fork",
+          objective: "Internal processing",
+          fork: true,
+        },
+        makeContext("parent-conv-silent", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      expect(capturedConfig!.sendResultToUser).toBe(false);
+    } finally {
+      manager.spawn = originalSpawn;
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("fork: true with explicit send_result_to_user: true preserves it", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+    const originalResolve = manager.resolveParentConversation;
+
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "fork-visible-id";
+    };
+
+    manager.resolveParentConversation = (id: string) => {
+      if (id === "parent-conv-visible") {
+        return {
+          messages: FAKE_PARENT_MESSAGES,
+          getCurrentSystemPrompt: () => "Parent prompt.",
+        } as any;
+      }
+      return undefined;
+    };
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Visible fork",
+          objective: "Share with user",
+          fork: true,
+          send_result_to_user: true,
+        },
+        makeContext("parent-conv-visible", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      expect(capturedConfig!.sendResultToUser).toBe(true);
+    } finally {
+      manager.spawn = originalSpawn;
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("fork: false / omitted behaves identically to current behavior", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+
+    // Test with fork: false
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "regular-subagent-id";
+    };
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Regular task",
+          objective: "Do something",
+          fork: false,
+          role: "researcher",
+          context: "Some context",
+        },
+        makeContext("regular-conv-1", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      // Should NOT have fork fields
+      expect(capturedConfig!.fork).toBeUndefined();
+      expect(capturedConfig!.parentMessages).toBeUndefined();
+      expect(capturedConfig!.parentSystemPrompt).toBeUndefined();
+      // Should have role
+      expect(capturedConfig!.role).toBe("researcher");
+      // Should have regular sendResultToUser default (true)
+      expect(capturedConfig!.sendResultToUser).toBe(true);
+      expect(capturedConfig!.context).toBe("Some context");
+
+      // Response should NOT include isFork
+      const parsed = JSON.parse(result.content);
+      expect(parsed.isFork).toBeUndefined();
+      expect(parsed.message).toContain("spawned");
+      expect(parsed.message).not.toContain("Forked");
+    } finally {
+      manager.spawn = originalSpawn;
+    }
+  });
+
+  test("fork omitted behaves like fork: false", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "omitted-fork-id";
+    };
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "No fork field",
+          objective: "Standard task",
+        },
+        makeContext("no-fork-conv", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(false);
+      expect(capturedConfig).toBeDefined();
+      expect(capturedConfig!.fork).toBeUndefined();
+      expect(capturedConfig!.parentMessages).toBeUndefined();
+      expect(capturedConfig!.parentSystemPrompt).toBeUndefined();
+      expect(capturedConfig!.sendResultToUser).toBe(true);
+
+      const parsed = JSON.parse(result.content);
+      expect(parsed.isFork).toBeUndefined();
+    } finally {
+      manager.spawn = originalSpawn;
+    }
+  });
+
+  test("error when parent conversation cannot be resolved", async () => {
+    const manager = getSubagentManager();
+    const originalResolve = manager.resolveParentConversation;
+
+    // resolveParentConversation returns undefined
+    manager.resolveParentConversation = () => undefined;
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Orphan fork",
+          objective: "Should fail",
+          fork: true,
+        },
+        makeContext("nonexistent-parent", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(true);
+      expect(result.content).toContain("Cannot fork");
+      expect(result.content).toContain("parent conversation could not be resolved");
+    } finally {
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("error when resolveParentConversation is not wired", async () => {
+    const manager = getSubagentManager();
+    const originalResolve = manager.resolveParentConversation;
+
+    // Unset the callback entirely
+    manager.resolveParentConversation = undefined;
+
+    try {
+      const result = await executeSubagentSpawn(
+        {
+          label: "Unwired fork",
+          objective: "Should fail",
+          fork: true,
+        },
+        makeContext("some-parent", { sendToClient: () => {} }),
+      );
+
+      expect(result.isError).toBe(true);
+      expect(result.content).toContain("Cannot fork");
+      expect(result.content).toContain("parent conversation could not be resolved");
+    } finally {
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+
+  test("fork: true shallow copies parent messages", async () => {
+    const manager = getSubagentManager();
+    const originalSpawn = manager.spawn.bind(manager);
+    const originalResolve = manager.resolveParentConversation;
+
+    const originalMessages = [...FAKE_PARENT_MESSAGES];
+    let capturedConfig: Record<string, unknown> | undefined;
+    manager.spawn = async (config: Record<string, unknown>) => {
+      capturedConfig = config;
+      return "copy-check-id";
+    };
+
+    manager.resolveParentConversation = (id: string) => {
+      if (id === "parent-conv-copy") {
+        return {
+          messages: originalMessages,
+          getCurrentSystemPrompt: () => "Prompt.",
+        } as any;
+      }
+      return undefined;
+    };
+
+    try {
+      await executeSubagentSpawn(
+        {
+          label: "Copy check",
+          objective: "Test",
+          fork: true,
+        },
+        makeContext("parent-conv-copy", { sendToClient: () => {} }),
+      );
+
+      expect(capturedConfig).toBeDefined();
+      const passedMessages = capturedConfig!.parentMessages as Message[];
+      // Should be a different array reference (shallow copy via spread)
+      expect(passedMessages).not.toBe(originalMessages);
+      // But same content
+      expect(passedMessages).toEqual(originalMessages);
+    } finally {
+      manager.spawn = originalSpawn;
+      manager.resolveParentConversation = originalResolve;
+    }
+  });
+});

package/src/__tests__/subagent-tools.test.ts

@@ -86,6 +86,7 @@ function injectSubagent(
     },
     status,
     conversationId: `conv-${subagentId}`,
+    isFork: false,
     createdAt: Date.now(),
     usage: { inputTokens: 0, outputTokens: 0, estimatedCost: 0 },
     ...overrides,

package/src/__tests__/subagent-types.test.ts

@@ -68,6 +68,7 @@ describe("SubagentState type shape", () => {
       },
       status: "pending" as SubagentStatus,
       conversationId: "conv-id",
+      isFork: false,
       createdAt: Date.now(),
       usage: { inputTokens: 0, outputTokens: 0, estimatedCost: 0 },
     };

package/src/__tests__/system-prompt-ask-mode.test.ts

@@ -1,16 +1,15 @@
-/**
- * Tests for the "Action Confirmation Mode" system prompt injection.
- *
- * Verifies:
- *   - Prompt includes the section when `permission-controls-v2` flag is enabled
- *     AND `askBeforeActing` is `true`.
- *   - Prompt excludes the section when the flag is disabled.
- *   - Prompt excludes the section when `askBeforeActing` is `false`.
- */
-import { mkdirSync } from "node:fs";
-import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import {
+  afterAll,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  mock,
+  test,
+} from "bun:test";
 
-// Mock platform to use a temp directory
 const TEST_DIR = process.env.VELLUM_WORKSPACE_DIR!;
 
 const noopLogger: Record<string, unknown> = new Proxy(
@@ -65,75 +64,32 @@ mock.module("../prompts/user-reference.js", () => ({
   resolveUserPronouns: () => null,
 }));
 
-// ---------------------------------------------------------------------------
-// Controllable mocks for feature flags and permission mode
-// ---------------------------------------------------------------------------
-
-let flagEnabled = false;
-let askBeforeActing = true;
-
-mock.module("../config/assistant-feature-flags.js", () => ({
-  isAssistantFeatureFlagEnabled: (key: string) => {
-    if (key === "permission-controls-v2") return flagEnabled;
-    return true;
-  },
-  _setOverridesForTesting: () => {},
-  clearFeatureFlagOverridesCache: () => {},
-  getAssistantFeatureFlagDefaults: () => ({}),
-}));
-
-mock.module("../permissions/permission-mode-store.js", () => ({
-  getMode: () => ({ askBeforeActing, hostAccess: false }),
-  initPermissionModeStore: () => {},
-  setAskBeforeActing: () => {},
-  setHostAccess: () => {},
-  onModeChanged: () => () => {},
-  resetForTesting: () => {},
-}));
-
-// Import after mocks
 const { buildSystemPrompt } = await import("../prompts/system-prompt.js");
 
-const ACTION_CONFIRMATION_HEADING = "## Action Confirmation Mode";
+const SOUL_PATH = join(TEST_DIR, "SOUL.md");
 
-describe("Action Confirmation Mode system prompt injection", () => {
+afterAll(() => {
+  mock.restore();
+});
+
+describe("system prompt no longer injects ask-before-acting mode", () => {
   beforeEach(() => {
     mkdirSync(TEST_DIR, { recursive: true });
-    flagEnabled = false;
-    askBeforeActing = true;
+    writeFileSync(SOUL_PATH, "# Soul\n\nSOUL guidance survives.");
   });
 
   afterEach(() => {
-    flagEnabled = false;
-    askBeforeActing = true;
-  });
-
-  test("includes section when flag enabled and askBeforeActing is true", () => {
-    flagEnabled = true;
-    askBeforeActing = true;
-    const result = buildSystemPrompt();
-    expect(result).toContain(ACTION_CONFIRMATION_HEADING);
-    expect(result).toContain('"Ask before acting" mode');
+    try {
+      rmSync(SOUL_PATH, { force: true });
+    } catch {
+      /* noop */
+    }
   });
 
-  test("excludes section when flag is disabled", () => {
-    flagEnabled = false;
-    askBeforeActing = true;
-    const result = buildSystemPrompt();
-    expect(result).not.toContain(ACTION_CONFIRMATION_HEADING);
-  });
-
-  test("excludes section when askBeforeActing is false", () => {
-    flagEnabled = true;
-    askBeforeActing = false;
-    const result = buildSystemPrompt();
-    expect(result).not.toContain(ACTION_CONFIRMATION_HEADING);
-  });
+  test("includes SOUL.md and does not inject action confirmation copy", () => {
+    const prompt = buildSystemPrompt();
 
-  test("excludes section when both flag disabled and askBeforeActing false", () => {
-    flagEnabled = false;
-    askBeforeActing = false;
-    const result = buildSystemPrompt();
-    expect(result).not.toContain(ACTION_CONFIRMATION_HEADING);
+    expect(prompt).toContain("SOUL guidance survives.");
+    expect(prompt).not.toContain("Action Confirmation Mode");
   });
 });

package/src/__tests__/system-prompt.test.ts

@@ -31,6 +31,10 @@ mock.module("../util/logger.js", () => ({
   pruneOldLogFiles: () => 0,
 }));
 
+// Mutable config used by the mocked loader so individual tests can override
+// specific fields (e.g. systemPromptPrefix) without touching other sections.
+const mockLoadedConfig: Record<string, unknown> = {};
+
 mock.module("../config/loader.js", () => ({
   getConfig: () => ({
     ui: {},
@@ -49,7 +53,7 @@ mock.module("../config/loader.js", () => ({
       "web-search": { mode: "your-own", provider: "inference-provider-native" },
     },
   }),
-  loadConfig: () => ({}),
+  loadConfig: () => mockLoadedConfig,
   loadRawConfig: () => ({}),
   saveConfig: () => {},
   saveRawConfig: () => {},
@@ -123,6 +127,7 @@ describe("buildSystemPrompt", () => {
       const p = join(TEST_DIR, name);
       if (existsSync(p)) rmSync(p, { recursive: true, force: true });
     }
+    delete mockLoadedConfig.systemPromptPrefix;
   });
 
   test("returns empty string when no files exist", () => {
@@ -343,6 +348,72 @@ describe("buildSystemPrompt", () => {
     const result = buildSystemPrompt();
     expect(basePrompt(result)).toBe("");
   });
+
+  describe("custom systemPromptPrefix", () => {
+    test("omits prefix when config value is unset", () => {
+      const result = buildSystemPrompt();
+      // With no prefix, the prompt should start with the parallel tool calls
+      // section (the first static section when no prefix is injected).
+      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+    });
+
+    test("omits prefix when config value is null", () => {
+      mockLoadedConfig.systemPromptPrefix = null;
+      const result = buildSystemPrompt();
+      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+    });
+
+    test("omits prefix when config value is an empty string", () => {
+      mockLoadedConfig.systemPromptPrefix = "";
+      const result = buildSystemPrompt();
+      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+    });
+
+    test("omits prefix when config value is whitespace-only", () => {
+      mockLoadedConfig.systemPromptPrefix = "   \n\n  ";
+      const result = buildSystemPrompt();
+      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+    });
+
+    test("injects prefix at the very start of the prompt when set", () => {
+      mockLoadedConfig.systemPromptPrefix = "You are operating in demo mode.";
+      const result = buildSystemPrompt();
+      expect(result.startsWith("You are operating in demo mode.")).toBe(true);
+      // The standard static sections should still follow the prefix.
+      expect(result).toContain("<use_parallel_tool_calls>");
+      // Prefix lives in the static (cached) block, not the dynamic block.
+      const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
+      expect(boundaryIdx).toBeGreaterThan(-1);
+      const staticBlock = result.slice(0, boundaryIdx);
+      expect(staticBlock).toContain("You are operating in demo mode.");
+    });
+
+    test("trims leading/trailing whitespace from the prefix", () => {
+      mockLoadedConfig.systemPromptPrefix =
+        "\n\n  Pretend you are a pirate.  \n\n";
+      const result = buildSystemPrompt();
+      expect(result.startsWith("Pretend you are a pirate.")).toBe(true);
+    });
+
+    test("multi-line prefixes are preserved verbatim after trimming", () => {
+      mockLoadedConfig.systemPromptPrefix =
+        "# Org Guardrails\n\n- Never discuss pricing.\n- Escalate refunds.";
+      const result = buildSystemPrompt();
+      expect(
+        result.startsWith(
+          "# Org Guardrails\n\n- Never discuss pricing.\n- Escalate refunds.",
+        ),
+      ).toBe(true);
+    });
+
+    test("workspace file content still appears after prefix", () => {
+      mockLoadedConfig.systemPromptPrefix = "Custom prefix";
+      writeFileSync(join(TEST_DIR, "IDENTITY.md"), "I am Vellum.");
+      const result = buildSystemPrompt();
+      expect(result.startsWith("Custom prefix")).toBe(true);
+      expect(basePrompt(result)).toBe("I am Vellum.");
+    });
+  });
 });
 
 describe("stripCommentLines", () => {