@vellumai/assistant 0.5.16 → 0.6.1

package/src/__tests__/subagent-manager-notify.test.ts

@@ -22,7 +22,7 @@ interface FakeManagedSubagent {
       outputTokens: number;
       estimatedCost: number;
     };
-  };
+  } | null;
   state: SubagentState;
   parentSendToClient: (msg: ServerMessage) => void;
 }
@@ -32,6 +32,7 @@ interface ManagerInternals {
   subagents: Map<string, FakeManagedSubagent>;
   parentToChildren: Map<string, Set<string>>;
   runSubagent: (subagentId: string, objective: string) => Promise<void>;
+  stopSweep: () => void;
 }
 
 function asInternals(manager: SubagentManager): ManagerInternals {
@@ -275,8 +276,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
 
     // Patch the fake conversation to simulate a successful agent loop.
     const managed = asInternals(manager).subagents.get(subagentId)!;
-    managed.conversation.persistUserMessage = () => "msg-1";
-    managed.conversation.runAgentLoop = async () => {};
+    managed.conversation!.persistUserMessage = () => "msg-1";
+    managed.conversation!.runAgentLoop = async () => {};
 
     const notifications: { parentConversationId: string; message: string }[] =
       [];
@@ -298,6 +299,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
       '[Subagent "Test subagent" completed]',
     );
     expect(notifications[0].message).toContain("subagent_read");
+
+    asInternals(manager).stopSweep();
   });
 
   test("failed subagent notifies parent with error and asks user before retry", async () => {
@@ -309,8 +312,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
     // Patch the fake conversation to simulate a failure.
     const managed = asInternals(manager).subagents.get(subagentId)!;
 
-    managed.conversation.persistUserMessage = () => "msg-1";
-    managed.conversation.runAgentLoop = async () => {
+    managed.conversation!.persistUserMessage = () => "msg-1";
+    managed.conversation!.runAgentLoop = async () => {
       throw new Error("API rate limit exceeded");
     };
 
@@ -333,6 +336,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
     expect(notifications[0].message).toContain("failed");
     expect(notifications[0].message).toContain("API rate limit exceeded");
     expect(notifications[0].message).toContain("Do NOT re-spawn");
+
+    asInternals(manager).stopSweep();
   });
 
   test("failed subagent does not notify if already aborted", async () => {
@@ -343,8 +348,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
 
     const managed = asInternals(manager).subagents.get(subagentId)!;
 
-    managed.conversation.persistUserMessage = () => "msg-1";
-    managed.conversation.runAgentLoop = async () => {
+    managed.conversation!.persistUserMessage = () => "msg-1";
+    managed.conversation!.runAgentLoop = async () => {
       throw new Error("Conversation aborted");
     };
 
@@ -358,6 +363,8 @@ describe("SubagentManager notifyParent (via runSubagent)", () => {
 
     // Should NOT notify — status was already terminal (aborted).
     expect(notifications).toHaveLength(0);
+
+    asInternals(manager).stopSweep();
   });
 });
 
@@ -422,9 +429,9 @@ describe("SubagentManager abort race guard", () => {
     // Patch conversation to simulate successful completion after abort.
     const managed = asInternals(manager).subagents.get(subagentId)!;
 
-    managed.conversation.persistUserMessage = () => "msg-1";
-    managed.conversation.runAgentLoop = async () => {};
-    managed.conversation.messages = [
+    managed.conversation!.persistUserMessage = () => "msg-1";
+    managed.conversation!.runAgentLoop = async () => {};
+    managed.conversation!.messages = [
       { role: "assistant", content: [{ type: "text", text: "Done!" }] },
     ];
 
@@ -440,6 +447,8 @@ describe("SubagentManager abort race guard", () => {
     expect(notifications).toHaveLength(0);
     // Status should remain aborted, not overwritten to completed.
     expect(state.status).toBe("aborted");
+
+    asInternals(manager).stopSweep();
   });
 });
 

package/src/__tests__/subagent-notify-parent.test.ts

@@ -0,0 +1,390 @@
+import { describe, expect, mock, test } 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 { isToolActiveForContext } from "../daemon/conversation-tool-setup.js";
+import { getSubagentManager } from "../subagent/index.js";
+import { SubagentManager } from "../subagent/manager.js";
+import type { SubagentState } from "../subagent/types.js";
+import {
+  executeSubagentNotifyParent,
+  notifyParentTool,
+} from "../tools/subagent/notify-parent.js";
+
+// ── Shared helpers ──────────────────────────────────────────────────
+
+/**
+ * Inject a fake subagent into the singleton manager so tool executors
+ * can find it. Uses the same private-internals trick as the other tests.
+ */
+function injectSubagent(
+  manager: SubagentManager,
+  subagentId: string,
+  parentConversationId: string,
+  status: SubagentState["status"] = "running",
+  overrides: Partial<SubagentState> = {},
+): SubagentState {
+  const internals = manager as unknown as {
+    subagents: Map<
+      string,
+      {
+        conversation: unknown;
+        state: SubagentState;
+        parentSendToClient: () => void;
+      }
+    >;
+    parentToChildren: Map<string, Set<string>>;
+  };
+  const state: SubagentState = {
+    config: {
+      id: subagentId,
+      parentConversationId,
+      label: "Test",
+      objective: "test",
+    },
+    status,
+    conversationId: `conv-${subagentId}`,
+    createdAt: Date.now(),
+    usage: { inputTokens: 0, outputTokens: 0, estimatedCost: 0 },
+    ...overrides,
+  };
+  const fakeConversation = {
+    abort: () => {},
+    dispose: () => {},
+    messages: [],
+    sendToClient: () => {},
+    usageStats: { inputTokens: 0, outputTokens: 0, estimatedCost: 0 },
+    enqueueMessage: () => ({ queued: false }),
+    persistUserMessage: () => "msg-1",
+    runAgentLoop: async () => {},
+  };
+  internals.subagents.set(subagentId, {
+    conversation: fakeConversation,
+    state,
+    parentSendToClient: () => {},
+  });
+  if (!internals.parentToChildren.has(parentConversationId)) {
+    internals.parentToChildren.set(parentConversationId, new Set());
+  }
+  internals.parentToChildren.get(parentConversationId)!.add(subagentId);
+  return state;
+}
+
+function makeContext(
+  conversationId: string,
+  extras: Record<string, unknown> = {},
+) {
+  return {
+    workingDir: "/tmp",
+    conversationId,
+    trustClass: "guardian" as const,
+    ...extras,
+  } as import("../tools/types.js").ToolContext;
+}
+
+// ── Tool definition ────────────────────────────────────────────────
+
+describe("notify_parent tool definition", () => {
+  test("has correct core tool definition", () => {
+    const def = notifyParentTool.getDefinition();
+    const schema = def.input_schema as Record<string, unknown>;
+    expect(def.name).toBe("notify_parent");
+    expect(schema.required).toContain("message");
+    expect(
+      (schema.properties as Record<string, Record<string, unknown>>).urgency
+        .enum,
+    ).toEqual([
+      "info",
+      "important",
+      "blocked",
+    ]);
+    expect(notifyParentTool.category).toBe("orchestration");
+  });
+
+  test("is hidden from non-subagent context", () => {
+    const ctx = {
+      isSubagent: false,
+      preactivatedSkillIds: [],
+      skillProjectionState: new Map(),
+      skillProjectionCache: new Map(),
+      coreToolNames: new Set<string>(),
+      toolsDisabledDepth: 0,
+    } as unknown as import("../daemon/conversation-tool-setup.js").SkillProjectionContext;
+    expect(isToolActiveForContext("notify_parent", ctx)).toBe(false);
+  });
+
+  test("is hidden when isSubagent is undefined", () => {
+    const ctx = {
+      preactivatedSkillIds: [],
+      skillProjectionState: new Map(),
+      skillProjectionCache: new Map(),
+      coreToolNames: new Set<string>(),
+      toolsDisabledDepth: 0,
+    } as unknown as import("../daemon/conversation-tool-setup.js").SkillProjectionContext;
+    expect(isToolActiveForContext("notify_parent", ctx)).toBe(false);
+  });
+
+  test("is visible to subagent context", () => {
+    const ctx = {
+      isSubagent: true,
+      preactivatedSkillIds: [],
+      skillProjectionState: new Map(),
+      skillProjectionCache: new Map(),
+      coreToolNames: new Set<string>(),
+      toolsDisabledDepth: 0,
+    } as unknown as import("../daemon/conversation-tool-setup.js").SkillProjectionContext;
+    expect(isToolActiveForContext("notify_parent", ctx)).toBe(true);
+  });
+});
+
+// ── executeSubagentNotifyParent ────────────────────────────────────
+
+describe("executeSubagentNotifyParent", () => {
+  test("rejects calls from non-subagent conversations", async () => {
+    const result = await executeSubagentNotifyParent(
+      { message: "Found something important" },
+      makeContext("not-a-subagent-conv"),
+    );
+    expect(result.isError).toBe(true);
+    expect(result.content).toContain("Could not notify parent");
+    expect(result.content).toContain("only available to subagents");
+  });
+
+  test("succeeds when called from a subagent conversation", async () => {
+    const manager = getSubagentManager();
+    const subagentId = "notify-sub-1";
+    const parentConversationId = "notify-parent-1";
+    injectSubagent(manager, subagentId, parentConversationId, "running");
+
+    // Wire up the onSubagentFinished callback.
+    let capturedMessage = "";
+    manager.onSubagentFinished = (
+      _parentId: string,
+      message: string,
+    ) => {
+      capturedMessage = message;
+    };
+
+    try {
+      const result = await executeSubagentNotifyParent(
+        { message: "Found key results", urgency: "important" },
+        makeContext(`conv-${subagentId}`),
+      );
+      expect(result.isError).toBe(false);
+      const parsed = JSON.parse(result.content);
+      expect(parsed.sent).toBe(true);
+      expect(parsed.urgency).toBe("important");
+      expect(capturedMessage).toContain("Found key results");
+    } finally {
+      manager.onSubagentFinished = undefined;
+    }
+  });
+
+  test("formats message with label and urgency", async () => {
+    const manager = getSubagentManager();
+    const subagentId = "notify-format-1";
+    const parentConversationId = "notify-format-parent";
+    injectSubagent(manager, subagentId, parentConversationId, "running", {
+      config: {
+        id: subagentId,
+        parentConversationId,
+        label: "Research Task",
+        objective: "research",
+      },
+    });
+
+    let capturedMessage = "";
+    manager.onSubagentFinished = (
+      _parentId: string,
+      message: string,
+    ) => {
+      capturedMessage = message;
+    };
+
+    try {
+      await executeSubagentNotifyParent(
+        { message: "Preliminary findings ready", urgency: "info" },
+        makeContext(`conv-${subagentId}`),
+      );
+      expect(capturedMessage).toBe(
+        '[Subagent "Research Task" — info] Preliminary findings ready',
+      );
+    } finally {
+      manager.onSubagentFinished = undefined;
+    }
+  });
+
+  test("returns error when message is empty", async () => {
+    const result = await executeSubagentNotifyParent(
+      { message: "" },
+      makeContext("some-conv"),
+    );
+    expect(result.isError).toBe(true);
+    expect(result.content).toContain('"message" is required');
+  });
+
+  test("returns error when message is missing", async () => {
+    const result = await executeSubagentNotifyParent(
+      {},
+      makeContext("some-conv"),
+    );
+    expect(result.isError).toBe(true);
+    expect(result.content).toContain('"message" is required');
+  });
+
+  test("defaults urgency to info when not provided", async () => {
+    const manager = getSubagentManager();
+    const subagentId = "notify-default-urg-1";
+    const parentConversationId = "notify-default-urg-parent";
+    injectSubagent(manager, subagentId, parentConversationId, "running");
+
+    manager.onSubagentFinished = () => {};
+
+    try {
+      const result = await executeSubagentNotifyParent(
+        { message: "Progress update" },
+        makeContext(`conv-${subagentId}`),
+      );
+      expect(result.isError).toBe(false);
+      const parsed = JSON.parse(result.content);
+      expect(parsed.urgency).toBe("info");
+    } finally {
+      manager.onSubagentFinished = undefined;
+    }
+  });
+
+  test("appends guidance hint for blocked urgency", async () => {
+    const manager = getSubagentManager();
+    const subagentId = "notify-blocked-1";
+    const parentConversationId = "notify-blocked-parent";
+    injectSubagent(manager, subagentId, parentConversationId, "running");
+
+    let capturedMessage = "";
+    manager.onSubagentFinished = (
+      _parentId: string,
+      message: string,
+    ) => {
+      capturedMessage = message;
+    };
+
+    try {
+      await executeSubagentNotifyParent(
+        { message: "Need API key to proceed", urgency: "blocked" },
+        makeContext(`conv-${subagentId}`),
+      );
+      expect(capturedMessage).toContain("Need API key to proceed");
+      expect(capturedMessage).toContain(
+        "Use subagent_message to send guidance to this subagent.",
+      );
+    } finally {
+      manager.onSubagentFinished = undefined;
+    }
+  });
+});
+
+// ── Manager-level tests ────────────────────────────────────────────
+
+describe("SubagentManager.notifyParent", () => {
+  test("returns false for terminal subagents", () => {
+    const manager = getSubagentManager();
+
+    for (const terminalStatus of [
+      "completed",
+      "failed",
+      "aborted",
+    ] as const) {
+      const subagentId = `notify-terminal-${terminalStatus}`;
+      const parentConversationId = `notify-terminal-parent-${terminalStatus}`;
+      injectSubagent(
+        manager,
+        subagentId,
+        parentConversationId,
+        terminalStatus,
+      );
+
+      manager.onSubagentFinished = () => {};
+
+      try {
+        const result = manager.notifyParent(
+          `conv-${subagentId}`,
+          "Should not arrive",
+          "info",
+        );
+        expect(result).toBe(false);
+      } finally {
+        manager.onSubagentFinished = undefined;
+      }
+    }
+  });
+
+  test("returns false when onSubagentFinished is not wired", () => {
+    const manager = getSubagentManager();
+    const subagentId = "notify-no-callback-1";
+    const parentConversationId = "notify-no-callback-parent";
+    injectSubagent(manager, subagentId, parentConversationId, "running");
+
+    manager.onSubagentFinished = undefined;
+
+    const result = manager.notifyParent(
+      `conv-${subagentId}`,
+      "Test message",
+      "info",
+    );
+    expect(result).toBe(false);
+  });
+});
+
+describe("SubagentManager.getParentInfo", () => {
+  test("returns undefined for unknown conversationIds", () => {
+    const manager = getSubagentManager();
+    const result = manager.getParentInfo("nonexistent-conversation-id");
+    expect(result).toBeUndefined();
+  });
+
+  test("returns parent info for known subagent conversationId", () => {
+    const manager = getSubagentManager();
+    const subagentId = "parent-info-sub-1";
+    const parentConversationId = "parent-info-parent-1";
+    injectSubagent(manager, subagentId, parentConversationId, "running", {
+      config: {
+        id: subagentId,
+        parentConversationId,
+        label: "Info Lookup",
+        objective: "look things up",
+      },
+    });
+
+    const info = manager.getParentInfo(`conv-${subagentId}`);
+    expect(info).toBeDefined();
+    expect(info!.parentConversationId).toBe(parentConversationId);
+    expect(info!.subagentId).toBe(subagentId);
+    expect(info!.label).toBe("Info Lookup");
+    expect(typeof info!.parentSendToClient).toBe("function");
+  });
+});

package/src/__tests__/subagent-role-registry.test.ts

@@ -0,0 +1,108 @@
+import { describe, expect, test } from "bun:test";
+
+import {
+  mergeSkillIds,
+  SUBAGENT_ROLE_REGISTRY,
+  type SubagentRole,
+} from "../subagent/index.js";
+
+/** All roles defined in the SubagentRole union. */
+const ALL_ROLES: SubagentRole[] = ["general", "researcher", "coder", "planner"];
+
+describe("SUBAGENT_ROLE_REGISTRY", () => {
+  test("covers all values in the SubagentRole union", () => {
+    const registryKeys = Object.keys(SUBAGENT_ROLE_REGISTRY);
+    expect(registryKeys.sort()).toEqual([...ALL_ROLES].sort());
+    expect(registryKeys).toHaveLength(ALL_ROLES.length);
+  });
+
+  test("every role has a non-empty systemPromptPreamble", () => {
+    for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
+      expect(config.systemPromptPreamble.length).toBeGreaterThan(0);
+    }
+  });
+
+  test("general has allowedTools: undefined", () => {
+    expect(SUBAGENT_ROLE_REGISTRY.general.allowedTools).toBeUndefined();
+  });
+
+  test("all non-general roles have allowedTools as a non-empty array", () => {
+    for (const role of ALL_ROLES) {
+      if (role === "general") continue;
+      const config = SUBAGENT_ROLE_REGISTRY[role];
+      expect(Array.isArray(config.allowedTools)).toBe(true);
+      expect(config.allowedTools!.length).toBeGreaterThan(0);
+    }
+  });
+
+  test('every role with allowedTools includes "notify_parent"', () => {
+    for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
+      if (config.allowedTools !== undefined) {
+        expect(config.allowedTools).toContain("notify_parent");
+      }
+    }
+  });
+
+  test('no role includes "skill_execute" (replaced by core tools)', () => {
+    for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
+      if (config.allowedTools !== undefined) {
+        expect(config.allowedTools).not.toContain("skill_execute");
+      }
+    }
+  });
+
+  test('researcher includes "recall" for memory access', () => {
+    const tools = SUBAGENT_ROLE_REGISTRY.researcher.allowedTools!;
+    expect(tools).toContain("recall");
+  });
+
+  test('coder includes "recall" for memory access', () => {
+    expect(SUBAGENT_ROLE_REGISTRY.coder.allowedTools!).toContain("recall");
+  });
+
+  test('planner includes "recall" for memory access', () => {
+    expect(SUBAGENT_ROLE_REGISTRY.planner.allowedTools!).toContain("recall");
+  });
+
+  test("no role references the old memory_recall tool name", () => {
+    for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
+      if (config.allowedTools !== undefined) {
+        expect(config.allowedTools).not.toContain("memory_recall");
+      }
+    }
+  });
+
+  test("every role has empty skillIds (no skill preactivation)", () => {
+    for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
+      expect(config.skillIds).toEqual([]);
+    }
+  });
+
+  test('researcher and planner include "file_list"', () => {
+    expect(SUBAGENT_ROLE_REGISTRY.researcher.allowedTools).toContain(
+      "file_list",
+    );
+    expect(SUBAGENT_ROLE_REGISTRY.planner.allowedTools).toContain("file_list");
+  });
+});
+
+describe("mergeSkillIds", () => {
+  test("removes duplicates between role and config skill IDs", () => {
+    expect(mergeSkillIds(["a", "b"], ["b", "c"])).toEqual(["a", "b", "c"]);
+  });
+
+  test("returns only role skills when config is undefined", () => {
+    expect(mergeSkillIds(["subagent"], undefined)).toEqual(["subagent"]);
+  });
+
+  test("includes caller-provided extras alongside role skills", () => {
+    expect(mergeSkillIds(["subagent"], ["custom-skill"])).toEqual([
+      "subagent",
+      "custom-skill",
+    ]);
+  });
+
+  test("returns empty array when both inputs are empty", () => {
+    expect(mergeSkillIds([], undefined)).toEqual([]);
+  });
+});

package/src/__tests__/subagent-tool-filtering.test.ts

@@ -0,0 +1,71 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+
+import {
+  isToolActiveForContext,
+  type SkillProjectionContext,
+  SUBAGENT_ONLY_TOOL_NAMES,
+} from "../daemon/conversation-tool-setup.js";
+
+const TEST_TOOL_NAME = "__test_subagent_only_tool__";
+
+describe("subagent-only tool filtering", () => {
+  beforeEach(() => {
+    SUBAGENT_ONLY_TOOL_NAMES.add(TEST_TOOL_NAME);
+  });
+
+  afterEach(() => {
+    SUBAGENT_ONLY_TOOL_NAMES.delete(TEST_TOOL_NAME);
+  });
+
+  test("hides subagent-only tools from main conversations (isSubagent=false)", () => {
+    const ctx: SkillProjectionContext = {
+      skillProjectionState: new Map(),
+      skillProjectionCache: {},
+      coreToolNames: new Set(),
+      toolsDisabledDepth: 0,
+      hasNoClient: false,
+      isSubagent: false,
+    };
+
+    expect(isToolActiveForContext(TEST_TOOL_NAME, ctx)).toBe(false);
+  });
+
+  test("hides subagent-only tools when isSubagent is undefined", () => {
+    const ctx: SkillProjectionContext = {
+      skillProjectionState: new Map(),
+      skillProjectionCache: {},
+      coreToolNames: new Set(),
+      toolsDisabledDepth: 0,
+      hasNoClient: false,
+    };
+
+    expect(isToolActiveForContext(TEST_TOOL_NAME, ctx)).toBe(false);
+  });
+
+  test("shows subagent-only tools to subagent conversations (isSubagent=true)", () => {
+    const ctx: SkillProjectionContext = {
+      skillProjectionState: new Map(),
+      skillProjectionCache: {},
+      coreToolNames: new Set(),
+      toolsDisabledDepth: 0,
+      hasNoClient: true,
+      isSubagent: true,
+    };
+
+    expect(isToolActiveForContext(TEST_TOOL_NAME, ctx)).toBe(true);
+  });
+
+  test("does not affect regular tools when isSubagent is false", () => {
+    const ctx: SkillProjectionContext = {
+      skillProjectionState: new Map(),
+      skillProjectionCache: {},
+      coreToolNames: new Set(),
+      toolsDisabledDepth: 0,
+      hasNoClient: false,
+      isSubagent: false,
+    };
+
+    // A regular tool not in SUBAGENT_ONLY_TOOL_NAMES should still be active
+    expect(isToolActiveForContext("bash", ctx)).toBe(true);
+  });
+});