@vellumai/assistant 0.8.8 → 0.8.9-dev.202606091926.ebb2d62

package/src/__tests__/subagent-fork-notifications.test.ts

@@ -11,7 +11,7 @@ const capturedNotifications: {
   message: string;
 }[] = [];
 
-mock.module("../daemon/conversation-store.js", () => ({
+mock.module("../daemon/conversation-registry.js", () => ({
   findConversation: (id: string) => ({
     enqueueMessage: (options: { content: string }) => {
       capturedNotifications.push({
@@ -23,8 +23,6 @@ mock.module("../daemon/conversation-store.js", () => ({
     persistUserMessage: async () => ({ id: "mock-msg", deduplicated: false }),
     runAgentLoop: async () => {},
   }),
-  addConversation: () => {},
-  removeConversation: () => {},
 }));
 
 mock.module("../runtime/assistant-event-hub.js", () => ({

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

@@ -4,7 +4,7 @@ import {
   clearConversations,
   findConversation,
   setConversation,
-} from "../daemon/conversation-store.js";
+} from "../daemon/conversation-registry.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
 import type { Message } from "../providers/types.js";
 import { SubagentManager } from "../subagent/manager.js";

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

@@ -11,7 +11,7 @@ const capturedNotifications: {
   message: string;
 }[] = [];
 
-mock.module("../daemon/conversation-store.js", () => ({
+mock.module("../daemon/conversation-registry.js", () => ({
   findConversation: (id: string) => ({
     enqueueMessage: (options: { content: string }) => {
       capturedNotifications.push({
@@ -23,8 +23,6 @@ mock.module("../daemon/conversation-store.js", () => ({
     persistUserMessage: async () => ({ id: "mock-msg", deduplicated: false }),
     runAgentLoop: async () => {},
   }),
-  addConversation: () => {},
-  removeConversation: () => {},
 }));
 
 mock.module("../runtime/assistant-event-hub.js", () => ({

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

@@ -36,7 +36,7 @@ mock.module("../memory/conversation-crud.js", () => ({
  */
 const capturedMessages: string[] = [];
 
-mock.module("../daemon/conversation-store.js", () => ({
+mock.module("../daemon/conversation-registry.js", () => ({
   findConversation: (_id: string) => ({
     enqueueMessage: (options: { content: string }) => {
       capturedMessages.push(options.content);
@@ -45,8 +45,6 @@ mock.module("../daemon/conversation-store.js", () => ({
     persistUserMessage: async () => ({ id: "mock-msg", deduplicated: false }),
     runAgentLoop: async () => {},
   }),
-  addConversation: () => {},
-  removeConversation: () => {},
 }));
 
 mock.module("../runtime/assistant-event-hub.js", () => ({

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

@@ -32,7 +32,7 @@ mock.module("../memory/conversation-crud.js", () => ({
 import {
   clearConversations,
   setConversation,
-} from "../daemon/conversation-store.js";
+} from "../daemon/conversation-registry.js";
 import type { Message } from "../providers/types.js";
 import { getSubagentManager } from "../subagent/index.js";
 import { executeSubagentSpawn } from "../tools/subagent/spawn.js";

package/src/__tests__/title-generate-hook.test.ts

@@ -51,9 +51,9 @@ import type {
   StopContext,
   UserPromptSubmitContext,
 } from "../plugin-api/types.js";
+import { defaultTitleGeneratePlugin } from "../plugins/defaults/index.js";
 import stop from "../plugins/defaults/title-generate/hooks/stop.js";
 import userPromptSubmit from "../plugins/defaults/title-generate/hooks/user-prompt-submit.js";
-import { defaultTitleGeneratePlugin } from "../plugins/defaults/title-generate/register.js";
 import { runHook } from "../plugins/pipeline.js";
 import {
   registerPlugin,
@@ -76,6 +76,10 @@ function makeCtx(
   ];
   return {
     conversationId: "conv-1",
+    userMessageId: "msg-1",
+    requestId: "req-1",
+    modelProfileKey: null,
+    isNonInteractive: false,
     prompt: "first message",
     originalMessages: messages,
     latestMessages: messages,

package/src/__tests__/tool-error-hook.test.ts

@@ -18,10 +18,10 @@ import { beforeEach, describe, expect, test } from "bun:test";
 
 import { HOOKS } from "../plugin-api/constants.js";
 import type { PluginLogger, PostToolUseContext } from "../plugin-api/types.js";
+import { defaultToolErrorPlugin } from "../plugins/defaults/index.js";
 import postToolUse, {
   TOOL_ERROR_NUDGE_TEXT,
 } from "../plugins/defaults/tool-error/hooks/post-tool-use.js";
-import { defaultToolErrorPlugin } from "../plugins/defaults/tool-error/register.js";
 import { runHook } from "../plugins/pipeline.js";
 import {
   registerPlugin,

package/src/__tests__/tool-result-truncate-hook.test.ts

@@ -16,8 +16,8 @@ import { beforeEach, describe, expect, test } from "bun:test";
 
 import { HOOKS } from "../plugin-api/constants.js";
 import type { PluginLogger, PostToolUseContext } from "../plugin-api/types.js";
+import { defaultToolResultTruncatePlugin } from "../plugins/defaults/index.js";
 import postToolUse from "../plugins/defaults/tool-result-truncate/hooks/post-tool-use.js";
-import { defaultToolResultTruncatePlugin } from "../plugins/defaults/tool-result-truncate/register.js";
 import {
   truncateToolResult,
   TRUNCATION_SUFFIX,

package/src/__tests__/tool-start-timestamp.test.ts

@@ -0,0 +1,218 @@
+/**
+ * Tests for `handleToolUse` stamping a tool start time both on the live
+ * `tool_use_start` event and on the already-durable persisted tool_use block.
+ *
+ * The live event carries `startedAt` so clients can anchor a running
+ * elapsed-time counter to the server clock instead of SSE receipt time. The
+ * persisted `_startedAt` (mapped to the wire `startedAt` in handlers/shared.ts)
+ * lets a `/messages` snapshot fetched mid-tool — e.g. after a refresh or
+ * reconnect, before the live event was seen — still render that counter.
+ */
+import { beforeEach, describe, expect, mock, test } from "bun:test";
+
+// ── Mock platform (must precede imports that read it) ─────────────────────────
+mock.module("../util/logger.js", () => ({
+  getLogger: () =>
+    new Proxy({} as Record<string, unknown>, {
+      get: () => () => {},
+    }),
+}));
+
+mock.module("../config/loader.js", () => ({
+  getConfig: () => ({
+    skills: {
+      entries: {},
+      load: { extraDirs: [], watch: false, watchDebounceMs: 0 },
+      install: { nodeManager: "npm" },
+      allowBundled: null,
+      remoteProviders: {
+        skillssh: { enabled: true },
+        clawhub: { enabled: true },
+      },
+      remotePolicy: {
+        blockSuspicious: true,
+        blockMalware: true,
+        maxSkillsShRisk: "medium",
+      },
+    },
+  }),
+  loadConfig: () => ({}),
+}));
+
+let mockedRowContent = "";
+const updates: Array<{ id: string; content: string }> = [];
+
+mock.module("../memory/conversation-crud.js", () => ({
+  addMessage: () => ({ id: "mock-msg-id" }),
+  getMessageById: (id: string) =>
+    mockedRowContent ? { id, content: mockedRowContent } : null,
+  updateMessageContent: (id: string, content: string) => {
+    updates.push({ id, content });
+  },
+  provenanceFromTrustContext: () => ({}),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
+}));
+
+mock.module("../memory/llm-request-log-store.js", () => ({
+  recordRequestLog: () => {},
+  backfillMessageIdOnLogs: () => {},
+}));
+
+mock.module("../runtime/assistant-stream-state.js", () => ({
+  getCurrentSeq: () => 0,
+  recordPersistedSeq: () => {},
+}));
+
+// ── Imports (after mocks) ─────────────────────────────────────────────────────
+import type { AgentEvent } from "../agent/loop.js";
+import type {
+  EventHandlerDeps,
+  EventHandlerState,
+} from "../daemon/conversation-agent-loop-handlers.js";
+import {
+  createEventHandlerState,
+  handleToolUse,
+} from "../daemon/conversation-agent-loop-handlers.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+function makeDeps(onEvent: (event: ServerMessage) => void): EventHandlerDeps {
+  return {
+    ctx: {
+      conversationId: "test-conv",
+      provider: { name: "anthropic" },
+      traceEmitter: { emit: () => {} },
+      streamThinking: false,
+      emitActivityState: () => {},
+      markWorkspaceTopLevelDirty: () => {},
+      currentTurnSurfaces: [],
+    } as unknown as EventHandlerDeps["ctx"],
+    onEvent,
+    reqId: "test-req",
+    isFirstMessage: false,
+    shouldGenerateTitle: false,
+    rlog: new Proxy({} as Record<string, unknown>, {
+      get: () => () => {},
+    }) as unknown as EventHandlerDeps["rlog"],
+    turnChannelContext: {
+      userMessageChannel: "vellum",
+      assistantMessageChannel: "vellum",
+    } as unknown as EventHandlerDeps["turnChannelContext"],
+    turnInterfaceContext: {
+      userMessageInterface: "web",
+      assistantMessageInterface: "web",
+    } as unknown as EventHandlerDeps["turnInterfaceContext"],
+    applyCompaction: async () => {},
+  };
+}
+
+function toolUseEvent(
+  id: string,
+  name: string,
+): Extract<AgentEvent, { type: "tool_use" }> {
+  return { type: "tool_use", id, name, input: { command: "ls" } };
+}
+
+function findBlockById(
+  rawContent: string,
+  id: string,
+): Record<string, unknown> {
+  const parsed = JSON.parse(rawContent) as Array<Record<string, unknown>>;
+  const block = parsed.find((b) => b.id === id);
+  if (!block) throw new Error(`block ${id} not found`);
+  return block;
+}
+
+// ── Tests ─────────────────────────────────────────────────────────────────────
+
+describe("handleToolUse — tool start timestamp", () => {
+  beforeEach(() => {
+    updates.length = 0;
+    mockedRowContent = "";
+  });
+
+  test("emits a numeric startedAt on the tool_use_start event and records it in state", () => {
+    // GIVEN a fresh handler state with a persisted assistant message
+    const toolUseId = "tu_bash";
+    const state: EventHandlerState = createEventHandlerState();
+    state.lastAssistantMessageId = "msg-1";
+    mockedRowContent = JSON.stringify([
+      {
+        type: "tool_use",
+        id: toolUseId,
+        name: "bash",
+        input: { command: "ls" },
+      },
+    ]);
+    const events: ServerMessage[] = [];
+    const before = Date.now();
+
+    // WHEN the tool begins
+    handleToolUse(
+      state,
+      makeDeps((e) => events.push(e)),
+      toolUseEvent(toolUseId, "bash"),
+    );
+
+    // THEN the emitted tool_use_start carries a numeric startedAt within the
+    // execution window AND the same value is recorded in toolCallTimestamps
+    const startEvent = events.find((e) => e.type === "tool_use_start");
+    expect(startEvent?.type).toBe("tool_use_start");
+    const startedAt =
+      startEvent?.type === "tool_use_start" ? startEvent.startedAt : undefined;
+    expect(typeof startedAt).toBe("number");
+    expect(startedAt).toBeGreaterThanOrEqual(before);
+    expect(startedAt).toBeLessThanOrEqual(Date.now());
+    expect(state.toolCallTimestamps.get(toolUseId)?.startedAt).toBe(startedAt);
+  });
+
+  test("stamps _startedAt onto the in-flight persisted tool_use block", () => {
+    // GIVEN a durable tool_use block with no timing metadata yet
+    const toolUseId = "tu_bash";
+    const state: EventHandlerState = createEventHandlerState();
+    state.lastAssistantMessageId = "msg-1";
+    mockedRowContent = JSON.stringify([
+      {
+        type: "tool_use",
+        id: toolUseId,
+        name: "bash",
+        input: { command: "ls" },
+      },
+    ]);
+    const events: ServerMessage[] = [];
+
+    // WHEN the tool begins
+    handleToolUse(
+      state,
+      makeDeps((e) => events.push(e)),
+      toolUseEvent(toolUseId, "bash"),
+    );
+
+    // THEN the persisted block is updated with _startedAt matching the event,
+    // so a mid-tool snapshot surfaces the start time via handlers/shared.ts
+    expect(updates).toHaveLength(1);
+    const block = findBlockById(updates[0].content, toolUseId);
+    const startEvent = events.find((e) => e.type === "tool_use_start");
+    const startedAt =
+      startEvent?.type === "tool_use_start" ? startEvent.startedAt : undefined;
+    expect(block._startedAt).toBe(startedAt);
+  });
+
+  test("does not write when no persisted block matches the tool id", () => {
+    // GIVEN a persisted message whose only block is unrelated to the tool
+    const state: EventHandlerState = createEventHandlerState();
+    state.lastAssistantMessageId = "msg-1";
+    mockedRowContent = JSON.stringify([{ type: "text", text: "thinking" }]);
+
+    // WHEN a tool begins
+    handleToolUse(
+      state,
+      makeDeps(() => {}),
+      toolUseEvent("tu_missing", "bash"),
+    );
+
+    // THEN no persisted-content write is attempted
+    expect(updates).toHaveLength(0);
+  });
+});