@vellumai/assistant 0.5.16 → 0.6.1

package/src/__tests__/trusted-contact-lifecycle-notifications.test.ts

@@ -11,7 +11,7 @@
  * 4. activated — when the trusted contact successfully verifies
  * 5. denied — when the guardian denies the request
  */
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Test isolation: in-memory SQLite via temp directory
@@ -70,17 +70,13 @@ import {
   createGuardianBinding,
   upsertContactChannel,
 } from "../contacts/contacts-write.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import { createApprovalRequest } from "../memory/guardian-approvals.js";
 import { createOutboundSession } from "../runtime/channel-verification-service.js";
 import { handleChannelInbound } from "../runtime/routes/channel-routes.js";
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -137,7 +133,7 @@ describe("trusted contact lifecycle notification signals", () => {
     resetState();
   });
 
-  test("guardian deny emits guardian_decision and denied signals", async () => {
+  test("guardian deny emits guardian_decision and denied signals with display names", async () => {
     // Set up guardian binding and member record (guardians must pass ACL)
     createGuardianBinding({
       channel: "telegram",
@@ -152,6 +148,17 @@ describe("trusted contact lifecycle notification signals", () => {
       externalChatId: "guardian-chat-789",
       status: "active",
       policy: "allow",
+      displayName: "Guardian Bob",
+    });
+
+    // Set up requester contact with a display name so payloads are enriched
+    upsertContactChannel({
+      sourceChannel: "telegram",
+      externalUserId: "requester-user-456",
+      externalChatId: "requester-chat-456",
+      status: "pending",
+      policy: "ask",
+      displayName: "Alice Requester",
     });
 
     const testRequestId = `req-deny-${Date.now()}`;
@@ -203,11 +210,15 @@ describe("trusted contact lifecycle notification signals", () => {
     expect(gdPayload.decision).toBe("denied");
     expect(gdPayload.requesterExternalUserId).toBe("requester-user-456");
     expect(gdPayload.decidedByExternalUserId).toBe("guardian-user-789");
+    expect(gdPayload.requesterDisplayName).toBe("Alice Requester");
+    expect(gdPayload.decidedByDisplayName).toBe("Guardian Bob");
 
     // Verify denied payload
     const dPayload = deniedSignals[0].contextPayload as Record<string, unknown>;
     expect(dPayload.decision).toBe("denied");
     expect(dPayload.requesterExternalUserId).toBe("requester-user-456");
+    expect(dPayload.requesterDisplayName).toBe("Alice Requester");
+    expect(dPayload.decidedByDisplayName).toBe("Guardian Bob");
 
     // Verify deduplication keys are distinct
     expect(guardianDecisionSignals[0].dedupeKey).toContain(
@@ -216,7 +227,7 @@ describe("trusted contact lifecycle notification signals", () => {
     expect(deniedSignals[0].dedupeKey).toContain("trusted-contact:denied:");
   });
 
-  test("guardian approve emits guardian_decision and verification_sent signals", async () => {
+  test("guardian approve emits guardian_decision and verification_sent signals with display names", async () => {
     // Set up guardian binding and member record (guardians must pass ACL)
     createGuardianBinding({
       channel: "telegram",
@@ -231,6 +242,17 @@ describe("trusted contact lifecycle notification signals", () => {
       externalChatId: "guardian-chat-789",
       status: "active",
       policy: "allow",
+      displayName: "Guardian Bob",
+    });
+
+    // Set up requester contact with a display name
+    upsertContactChannel({
+      sourceChannel: "telegram",
+      externalUserId: "requester-user-456",
+      externalChatId: "requester-chat-456",
+      status: "pending",
+      policy: "ask",
+      displayName: "Alice Requester",
     });
 
     const testRequestId = `req-approve-${Date.now()}`;
@@ -280,6 +302,8 @@ describe("trusted contact lifecycle notification signals", () => {
     const vsPayload = vsSignal.contextPayload as Record<string, unknown>;
     expect(vsPayload.requesterExternalUserId).toBe("requester-user-456");
     expect(vsPayload.verificationSessionId).toBeDefined();
+    expect(vsPayload.requesterDisplayName).toBe("Alice Requester");
+    expect(vsPayload.decidedByDisplayName).toBe("Guardian Bob");
     expect(
       (vsSignal.attentionHints as Record<string, unknown>).visibleInSourceNow,
     ).toBe(true);
@@ -344,6 +368,92 @@ describe("trusted contact lifecycle notification signals", () => {
     // guardian_decision and denied — both keyed on approval.id
     expect(signals.length).toBe(2);
   });
+
+  test("display name fields fall back to null when contacts have no display name", async () => {
+    // Set up guardian binding — createGuardianBinding creates a contact with
+    // displayName defaulting to the externalUserId. We need to verify the
+    // null-fallback path for display name resolution, so we use a guardian
+    // whose external user ID does NOT have a matching contact_channels row.
+    //
+    // Strategy: create the guardian binding normally (so the sender is
+    // classified as trustClass="guardian"), then use a DIFFERENT external
+    // user ID in the approval request's guardianExternalUserId field. The
+    // decidedByExternalUserId comes from actorExternalId (the real guardian),
+    // which DOES have a contact. To truly get null, we clear the guardian
+    // contact's displayName to empty string after creation — the signal
+    // enrichment code treats empty string the same as null for display
+    // purposes.
+    createGuardianBinding({
+      channel: "telegram",
+      guardianExternalUserId: "guardian-noname-111",
+      guardianDeliveryChatId: "guardian-chat-111",
+      guardianPrincipalId: "guardian-noname-111",
+      verifiedVia: "test",
+    });
+
+    // Clear the guardian contact's displayName to empty string so the
+    // display name resolution returns a falsy value. createGuardianBinding
+    // defaults displayName to the externalUserId, which would be a non-empty
+    // string and defeat the purpose of this test.
+    const db = getDb();
+    db.run("UPDATE contacts SET display_name = '' WHERE role = 'guardian'");
+
+    // Do NOT create a requester contact — display name should resolve to null
+
+    const testRequestId = `req-noname-${Date.now()}`;
+
+    createApprovalRequest({
+      runId: `ingress-access-request-${Date.now()}`,
+      requestId: testRequestId,
+      conversationId: "access-req-telegram-requester-noname-222",
+      channel: "telegram",
+      requesterExternalUserId: "requester-noname-222",
+      requesterChatId: "requester-chat-222",
+      guardianExternalUserId: "guardian-noname-111",
+      guardianChatId: "guardian-chat-111",
+      toolName: "ingress_access_request",
+      riskLevel: "access_request",
+      reason: "Unknown user requesting access",
+      expiresAt: Date.now() + GUARDIAN_APPROVAL_TTL_MS,
+    });
+
+    // Guardian denies via callback button
+    const guardianReq = buildInboundRequest({
+      conversationExternalId: "guardian-chat-111",
+      actorExternalId: "guardian-noname-111",
+      actorDisplayName: "Guardian",
+      content: "",
+      callbackData: `apr:${testRequestId}:reject`,
+    });
+
+    await handleChannelInbound(guardianReq, undefined, TEST_BEARER_TOKEN);
+
+    const guardianDecisionSignals = emitSignalCalls.filter(
+      (c) => c.sourceEventName === "ingress.trusted_contact.guardian_decision",
+    );
+    const deniedSignals = emitSignalCalls.filter(
+      (c) => c.sourceEventName === "ingress.trusted_contact.denied",
+    );
+
+    expect(guardianDecisionSignals.length).toBe(1);
+    expect(deniedSignals.length).toBe(1);
+
+    // Verify display names fall back to null/empty when contacts have no
+    // display name set.
+    const gdPayload = guardianDecisionSignals[0].contextPayload as Record<
+      string,
+      unknown
+    >;
+    expect(gdPayload.requesterDisplayName).toBeNull();
+    // Guardian contact exists but displayName was cleared to empty string.
+    // The signal enrichment resolves displayName from the contact record,
+    // so decidedByDisplayName will be "" (empty string) rather than null.
+    expect(gdPayload.decidedByDisplayName).toBe("");
+
+    const dPayload = deniedSignals[0].contextPayload as Record<string, unknown>;
+    expect(dPayload.requesterDisplayName).toBeNull();
+    expect(dPayload.decidedByDisplayName).toBe("");
+  });
 });
 
 // ---------------------------------------------------------------------------

package/src/__tests__/trusted-contact-multichannel.test.ts

@@ -6,7 +6,7 @@
  * These tests confirm no channel-specific assumptions leaked into the
  * trusted contact code paths.
  */
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Test isolation: in-memory SQLite via temp directory
@@ -78,7 +78,7 @@ import {
   createGuardianBinding,
   upsertContactChannel,
 } from "../contacts/contacts-write.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import {
   createOutboundSession,
   validateAndConsumeVerification,
@@ -87,10 +87,6 @@ import { handleChannelInbound } from "../runtime/routes/channel-routes.js";
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------

package/src/__tests__/trusted-contact-verification.test.ts

@@ -9,7 +9,7 @@
  * 4. Reactivate previously revoked members on re-verification
  * 5. NOT create a guardian binding (trusted contacts are not guardians)
  */
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Test isolation: in-memory SQLite via temp directory
@@ -31,7 +31,7 @@ import {
   revokeMember,
   upsertContactChannel,
 } from "../contacts/contacts-write.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import { resolveActorTrust } from "../runtime/actor-trust-resolver.js";
 import {
   createOutboundSession,
@@ -40,10 +40,6 @@ import {
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------

package/src/__tests__/turn-boundary-resolution.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
@@ -23,7 +23,7 @@ import {
   createConversation,
   getAssistantMessageIdsInTurn,
 } from "../memory/conversation-crud.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import { llmRequestLogs, toolInvocations } from "../memory/schema.js";
 
 initializeDb();
@@ -49,10 +49,6 @@ function toolResultContent(toolUseIds: string[]): string {
   );
 }
 
-afterAll(() => {
-  resetDb();
-});
-
 describe("getAssistantMessageIdsInTurn", () => {
   beforeEach(() => {
     resetTables();

package/src/__tests__/usage-cache-backfill-migration.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 let mockPricingOverrides: Array<{
   provider: string;
@@ -26,7 +26,6 @@ import {
   initializeDb,
   rawGet,
   rawRun,
-  resetDb,
 } from "../memory/db.js";
 import { migrateBackfillUsageCacheAccounting } from "../memory/migrations/140-backfill-usage-cache-accounting.js";
 import type { PricingUsage } from "../usage/types.js";
@@ -145,10 +144,6 @@ function foreignResponsePayload(): string {
   });
 }
 
-afterAll(() => {
-  resetDb();
-});
-
 describe("migrateBackfillUsageCacheAccounting", () => {
   beforeEach(() => {
     getSqlite().run(`DELETE FROM llm_request_logs`);

package/src/__tests__/usage-routes.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
@@ -7,16 +7,12 @@ mock.module("../util/logger.js", () => ({
     }),
 }));
 
-import { getSqlite, initializeDb, resetDb } from "../memory/db.js";
+import { getSqlite, initializeDb } from "../memory/db.js";
 import { recordUsageEvent } from "../memory/llm-usage-store.js";
 import { usageRouteDefinitions } from "../runtime/routes/usage-routes.js";
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 function clearUsageEvents() {
   getSqlite().run("DELETE FROM llm_usage_events");
 }

package/src/__tests__/verification-control-plane-policy.test.ts

@@ -129,14 +129,12 @@ function makePrompter(): PermissionPrompter {
   } as unknown as PermissionPrompter;
 }
 
-import { resetDb } from "../memory/db.js";
 import { initializeDb } from "../memory/db-init.js";
 
 beforeAll(() => {
   initializeDb();
 });
 afterAll(() => {
-  resetDb();
   mock.restore();
 });
 

package/src/__tests__/voice-invite-redemption.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
@@ -13,17 +13,13 @@ import {
   upsertContact,
 } from "../contacts/contact-store.js";
 import { upsertContactChannel } from "../contacts/contacts-write.js";
-import { getSqlite, initializeDb, resetDb } from "../memory/db.js";
+import { getSqlite, initializeDb } from "../memory/db.js";
 import { createInvite, revokeInvite } from "../memory/invite-store.js";
 import { redeemVoiceInviteCode } from "../runtime/invite-redemption-service.js";
 import { generateVoiceCode, hashVoiceCode } from "../util/voice-code.js";
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 function resetTables() {
   getSqlite().run("DELETE FROM assistant_ingress_invites");
   getSqlite().run("DELETE FROM contact_channels");

package/src/__tests__/voice-scoped-grant-consumer.test.ts

@@ -16,7 +16,7 @@
  *   4. Grants are revoked on call end (controller.destroy).
  */
 
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ── Platform + logger mocks (must come before any source imports) ────
 
@@ -82,7 +82,7 @@ import {
 } from "../calls/voice-session-bridge.js";
 import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import { scopedApprovalGrants } from "../memory/schema.js";
 import {
   _internal,
@@ -95,10 +95,6 @@ import { computeToolApprovalDigest } from "../security/tool-approval-digest.js";
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 // ---------------------------------------------------------------------------
 // Mock session that triggers a confirmation_request on processMessage
 // ---------------------------------------------------------------------------

package/src/__tests__/voice-session-bridge.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 import type { Conversation } from "../daemon/conversation.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
@@ -32,7 +32,7 @@ import {
   startVoiceTurn,
 } from "../calls/voice-session-bridge.js";
 import { createConversation } from "../memory/conversation-crud.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 
 initializeDb();
 
@@ -1017,7 +1017,3 @@ describe("voice-session-bridge", () => {
     expect(abortCalled).toBe(true);
   });
 });
-
-afterAll(() => {
-  resetDb();
-});

package/src/__tests__/volume-security-guard.test.ts

@@ -38,6 +38,8 @@ const ALLOWED_FILES = new Set([
   "assistant/src/cli/commands/trust.ts",
   // Auth middleware documentation comment (not a file access)
   "assistant/src/runtime/auth/middleware.ts",
+  // Permission checker: classifies file_read of signing key as High risk
+  "assistant/src/permissions/checker.ts",
 ]);
 
 // ---------------------------------------------------------------------------

package/src/__tests__/workspace-lifecycle.test.ts

@@ -6,7 +6,13 @@
  * in the same flow a real daemon conversation would follow.
  */
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  rmSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import {
@@ -23,6 +29,7 @@ import {
   getEnrichmentService,
 } from "../workspace/commit-message-enrichment-service.js";
 import {
+  _resetBreaker,
   _resetGitServiceRegistry,
   getWorkspaceGitService,
   WorkspaceGitService,
@@ -184,6 +191,27 @@ describe("Workspace git lifecycle (integration)", () => {
     await commitTurnChanges(testDir, conversationId, 3);
     expect(commitCount(testDir)).toBe(3); // Still 3
 
+    // Drain fire-and-forget enrichment from turn commits before heartbeat
+    // testing. Enrichment's writeNote() can leave a stale index.lock on
+    // some git versions (see heartbeat-service.ts:240-242), causing the
+    // heartbeat commit to fail with "index.lock: File exists".
+    await getEnrichmentService().shutdown();
+    _resetEnrichmentService();
+
+    // On CI, the enrichment service's spawned git child processes may still
+    // be alive briefly after the queue drains, holding index.lock. Remove it
+    // unconditionally and reset the circuit breaker so the heartbeat portion
+    // starts clean.
+    const lockPath = join(testDir, ".git", "index.lock");
+    if (existsSync(lockPath)) {
+      try {
+        unlinkSync(lockPath);
+      } catch {
+        /* race: already gone */
+      }
+    }
+    _resetBreaker(service);
+
     // ----------------------------------------------------------------
     // Step 5: Heartbeat safety net — simulate uncommitted changes
     //         that linger past the age threshold

package/src/__tests__/workspace-migration-009-backfill-conversation-disk-view.test.ts

@@ -7,7 +7,7 @@ import {
   writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Mocks — must come before any imports that depend on them
@@ -40,7 +40,7 @@ mock.module("../config/loader.js", () => ({
 // ---------------------------------------------------------------------------
 
 import { getConversationDirPath } from "../memory/conversation-disk-view.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import {
   attachments,
   conversations,
@@ -51,10 +51,6 @@ import { backfillConversationDiskViewMigration } from "../workspace/migrations/0
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 function resetTables() {
   const db = getDb();
   db.run("DELETE FROM message_attachments");

package/src/__tests__/workspace-migration-013-repair-conversation-disk-view.test.ts

@@ -7,7 +7,7 @@ import {
   writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Mocks — must come before any imports that depend on them
@@ -40,7 +40,7 @@ mock.module("../config/loader.js", () => ({
 // ---------------------------------------------------------------------------
 
 import { getConversationDirPath } from "../memory/conversation-disk-view.js";
-import { getDb, initializeDb, rawRun, resetDb } from "../memory/db.js";
+import { getDb, initializeDb, rawRun } from "../memory/db.js";
 import {
   attachments,
   conversations,
@@ -51,10 +51,6 @@ import { repairConversationDiskViewMigration } from "../workspace/migrations/013
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-});
-
 function resetTables() {
   const db = getDb();
   db.run("DELETE FROM message_attachments");