@vellumai/assistant 0.3.27 → 0.4.0

package/src/__tests__/bundled-asset.test.ts

@@ -0,0 +1,107 @@
+import { mkdirSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
+
+import { resolveBundledDir } from '../util/bundled-asset.js';
+
+let tempDir: string;
+
+beforeEach(() => {
+  tempDir = join(tmpdir(), `bundled-asset-test-${crypto.randomUUID()}`);
+  mkdirSync(tempDir, { recursive: true });
+});
+
+afterEach(() => {
+  rmSync(tempDir, { recursive: true, force: true });
+});
+
+describe('resolveBundledDir', () => {
+  test('source mode: returns join(callerDir, relativePath) when callerDir is a normal path', () => {
+    const result = resolveBundledDir('/some/source/path', 'templates', 'templates');
+    expect(result).toBe(join('/some/source/path', 'templates'));
+  });
+
+  test('source mode: does not check existsSync for the source path', () => {
+    // Even if the resolved path does not exist, it returns it as-is
+    const result = resolveBundledDir('/nonexistent/path', 'templates', 'templates');
+    expect(result).toBe(join('/nonexistent/path', 'templates'));
+  });
+
+  describe('compiled mode (/$bunfs/ prefix)', () => {
+    // In compiled mode, process.execPath determines fallback locations.
+    // We simulate by creating real directories at the expected fallback paths.
+
+    let savedExecPath: string;
+
+    beforeEach(() => {
+      savedExecPath = process.execPath;
+    });
+
+    afterEach(() => {
+      process.execPath = savedExecPath;
+    });
+
+    test('prefers Contents/Resources/<bundleName> when it exists', () => {
+      // Simulate macOS .app bundle: binary at Contents/MacOS/vellum-daemon
+      const macosDir = join(tempDir, 'Contents', 'MacOS');
+      const resourcesDir = join(tempDir, 'Contents', 'Resources');
+      mkdirSync(macosDir, { recursive: true });
+      mkdirSync(join(resourcesDir, 'templates'), { recursive: true });
+
+      process.execPath = join(macosDir, 'vellum-daemon');
+
+      const result = resolveBundledDir('/$bunfs/root/src/config', 'templates', 'templates');
+      expect(result).toBe(join(resourcesDir, 'templates'));
+    });
+
+    test('falls back to <execDir>/<bundleName> when Resources does not exist', () => {
+      // Simulate standalone binary deployment (no .app bundle)
+      const binDir = join(tempDir, 'bin');
+      mkdirSync(join(binDir, 'templates'), { recursive: true });
+
+      process.execPath = join(binDir, 'vellum-daemon');
+
+      const result = resolveBundledDir('/$bunfs/root/src/config', 'templates', 'templates');
+      expect(result).toBe(join(binDir, 'templates'));
+    });
+
+    test('falls back to source path when neither Resources nor execDir have the asset', () => {
+      const binDir = join(tempDir, 'bin');
+      mkdirSync(binDir, { recursive: true });
+      // Don't create any asset directories
+
+      process.execPath = join(binDir, 'vellum-daemon');
+
+      const result = resolveBundledDir('/$bunfs/root/src/config', 'templates', 'templates');
+      expect(result).toBe(join('/$bunfs/root/src/config', 'templates'));
+    });
+
+    test('Resources path takes priority over execDir path when both exist', () => {
+      const macosDir = join(tempDir, 'Contents', 'MacOS');
+      const resourcesDir = join(tempDir, 'Contents', 'Resources');
+      mkdirSync(macosDir, { recursive: true });
+      mkdirSync(join(resourcesDir, 'hook-templates'), { recursive: true });
+      // Also create at execDir level
+      mkdirSync(join(macosDir, 'hook-templates'), { recursive: true });
+
+      process.execPath = join(macosDir, 'vellum-daemon');
+
+      const result = resolveBundledDir('/$bunfs/root/src/hooks', '../../hook-templates', 'hook-templates');
+      expect(result).toBe(join(resourcesDir, 'hook-templates'));
+    });
+
+    test('works with different bundleName values', () => {
+      const macosDir = join(tempDir, 'Contents', 'MacOS');
+      const resourcesDir = join(tempDir, 'Contents', 'Resources');
+      mkdirSync(macosDir, { recursive: true });
+      mkdirSync(join(resourcesDir, 'prebuilt'), { recursive: true });
+
+      process.execPath = join(macosDir, 'vellum-daemon');
+
+      const result = resolveBundledDir('/$bunfs/root/src/home-base/prebuilt', '.', 'prebuilt');
+      expect(result).toBe(join(resourcesDir, 'prebuilt'));
+    });
+  });
+});

package/src/__tests__/call-controller.test.ts

@@ -32,6 +32,8 @@ mock.module('../util/logger.js', () => ({
 
 mock.module('../config/loader.js', () => ({
   getConfig: () => ({
+    ui: {},
+    
     provider: 'anthropic',
     providerOrder: ['anthropic'],
     apiKeys: { anthropic: 'test-key' },
@@ -47,6 +49,7 @@ mock.module('../config/loader.js', () => ({
       model: undefined,
     },
     memory: { enabled: false },
+    notifications: { decisionModelIntent: 'latency-optimized' },
   }),
 }));
 
@@ -127,11 +130,11 @@ import {
   updateCallSession,
 } from '../calls/call-store.js';
 import type { RelayConnection } from '../calls/relay-server.js';
-import { getDb, initializeDb, resetDb } from '../memory/db.js';
 import {
-  getGuardianActionRequest,
-  getPendingRequestByCallSessionId,
-} from '../memory/guardian-action-store.js';
+  getCanonicalGuardianRequest,
+  getPendingCanonicalRequestByCallSessionId,
+} from '../memory/canonical-guardian-store.js';
+import { getDb, initializeDb, resetDb } from '../memory/db.js';
 import { conversations } from '../memory/schema.js';
 
 initializeDb();
@@ -192,6 +195,8 @@ function ensureConversation(id: string): void {
 
 function resetTables() {
   const db = getDb();
+  db.run('DELETE FROM canonical_guardian_deliveries');
+  db.run('DELETE FROM canonical_guardian_requests');
   db.run('DELETE FROM guardian_action_deliveries');
   db.run('DELETE FROM guardian_action_requests');
   db.run('DELETE FROM call_pending_questions');
@@ -631,7 +636,7 @@ describe('call-controller', () => {
   test('handleCallerUtterance: passes guardian context to startVoiceTurn', async () => {
     const guardianCtx = {
       sourceChannel: 'voice' as const,
-      actorRole: 'non-guardian' as const,
+      trustClass: 'trusted_contact' as const,
       guardianExternalUserId: '+15550009999',
       guardianChatId: '+15550009999',
       requesterExternalUserId: '+15550002222',
@@ -683,13 +688,13 @@ describe('call-controller', () => {
   test('setGuardianContext: subsequent turns use updated guardian context', async () => {
     const initialCtx = {
       sourceChannel: 'voice' as const,
-      actorRole: 'unverified_channel' as const,
+      trustClass: 'unknown' as const,
       denialReason: 'no_binding' as const,
     };
 
     const upgradedCtx = {
       sourceChannel: 'voice' as const,
-      actorRole: 'guardian' as const,
+      trustClass: 'guardian' as const,
       guardianExternalUserId: '+15550003333',
       guardianChatId: '+15550003333',
     };
@@ -1163,7 +1168,7 @@ describe('call-controller', () => {
     await new Promise((r) => setTimeout(r, 10));
 
     // Verify a guardian action request was created
-    const pendingRequest = getPendingRequestByCallSessionId(session.id);
+    const pendingRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(pendingRequest).not.toBeNull();
     expect(pendingRequest!.status).toBe('pending');
 
@@ -1175,11 +1180,10 @@ describe('call-controller', () => {
     // Wait for the consultation timeout
     await new Promise((r) => setTimeout(r, 200));
 
-    // The guardian action request should now be expired with call_timeout reason
-    const timedOutRequest = getGuardianActionRequest(pendingRequest!.id);
+    // The canonical guardian request should now be expired
+    const timedOutRequest = getCanonicalGuardianRequest(pendingRequest!.id);
     expect(timedOutRequest).not.toBeNull();
     expect(timedOutRequest!.status).toBe('expired');
-    expect(timedOutRequest!.expiredReason).toBe('call_timeout');
 
     // Event should be recorded
     const events = getCallEvents(session.id);
@@ -1277,7 +1281,7 @@ describe('call-controller', () => {
     expect(question!.questionText).toBe('Allow send_email to bob@example.com?');
 
     // Verify the guardian action request has tool metadata
-    const pendingRequest = getPendingRequestByCallSessionId(session.id);
+    const pendingRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(pendingRequest).not.toBeNull();
     expect(pendingRequest!.toolName).toBe('send_email');
     expect(pendingRequest!.inputDigest).not.toBeNull();
@@ -1305,7 +1309,7 @@ describe('call-controller', () => {
     await controller.handleCallerUtterance('Send it');
     await new Promise((r) => setTimeout(r, 50));
 
-    const request1 = getPendingRequestByCallSessionId(session.id);
+    const request1 = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(request1).not.toBeNull();
 
     // Compute expected digest independently using the same utility
@@ -1326,7 +1330,7 @@ describe('call-controller', () => {
     await new Promise((r) => setTimeout(r, 50));
 
     // Verify the guardian action request has NO tool metadata
-    const pendingRequest = getPendingRequestByCallSessionId(session.id);
+    const pendingRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(pendingRequest).not.toBeNull();
     expect(pendingRequest!.toolName).toBeNull();
     expect(pendingRequest!.inputDigest).toBeNull();
@@ -1384,7 +1388,7 @@ describe('call-controller', () => {
     expect(question!.questionText).toBe('Allow send_message?');
 
     // Verify tool metadata was parsed correctly
-    const pendingRequest = getPendingRequestByCallSessionId(session.id);
+    const pendingRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(pendingRequest).not.toBeNull();
     expect(pendingRequest!.toolName).toBe('send_message');
     expect(pendingRequest!.inputDigest).not.toBeNull();
@@ -1411,7 +1415,7 @@ describe('call-controller', () => {
     await controller.handleCallerUtterance('Do something');
     await new Promise((r) => setTimeout(r, 50));
 
-    const pendingRequest = getPendingRequestByCallSessionId(session.id);
+    const pendingRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(pendingRequest).not.toBeNull();
     expect(pendingRequest!.questionText).toBe('Fallback question?');
     // Tool metadata should be null since the approval marker was malformed
@@ -1547,7 +1551,7 @@ describe('call-controller', () => {
 
     const firstQuestionId = controller.getPendingConsultationQuestionId();
     expect(firstQuestionId).not.toBeNull();
-    const firstRequest = getPendingRequestByCallSessionId(session.id);
+    const firstRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(firstRequest).not.toBeNull();
 
     // Repeated ASK_GUARDIAN with same informational question (no tool metadata)
@@ -1559,7 +1563,7 @@ describe('call-controller', () => {
 
     // Should coalesce: same consultation ID, same request
     expect(controller.getPendingConsultationQuestionId()).toBe(firstQuestionId);
-    const currentRequest = getPendingRequestByCallSessionId(session.id);
+    const currentRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(currentRequest).not.toBeNull();
     expect(currentRequest!.id).toBe(firstRequest!.id);
     expect(currentRequest!.status).toBe('pending');
@@ -1589,7 +1593,7 @@ describe('call-controller', () => {
 
     const firstQuestionId = controller.getPendingConsultationQuestionId();
     expect(firstQuestionId).not.toBeNull();
-    const firstRequest = getPendingRequestByCallSessionId(session.id);
+    const firstRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(firstRequest).not.toBeNull();
 
     // Repeated ASK_GUARDIAN_APPROVAL with same tool/input
@@ -1601,7 +1605,7 @@ describe('call-controller', () => {
 
     // Should coalesce: same consultation, same request
     expect(controller.getPendingConsultationQuestionId()).toBe(firstQuestionId);
-    const currentRequest = getPendingRequestByCallSessionId(session.id);
+    const currentRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(currentRequest!.id).toBe(firstRequest!.id);
     expect(currentRequest!.status).toBe('pending');
 
@@ -1623,7 +1627,7 @@ describe('call-controller', () => {
     await controller.handleCallerUtterance('Send email');
     await new Promise((r) => setTimeout(r, 50));
 
-    const firstRequest = getPendingRequestByCallSessionId(session.id);
+    const firstRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(firstRequest).not.toBeNull();
     expect(firstRequest!.toolName).toBe('send_email');
 
@@ -1640,18 +1644,15 @@ describe('call-controller', () => {
     await new Promise((r) => setTimeout(r, 100));
 
     // New consultation should be active
-    const secondRequest = getPendingRequestByCallSessionId(session.id);
+    const secondRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(secondRequest).not.toBeNull();
     expect(secondRequest!.id).not.toBe(firstRequest!.id);
     expect(secondRequest!.toolName).toBe('calendar_create');
 
-    // Old request should be expired with 'superseded' reason
-    const expiredRequest = getGuardianActionRequest(firstRequest!.id);
+    // Old request should be expired (superseded by the new one)
+    const expiredRequest = getCanonicalGuardianRequest(firstRequest!.id);
     expect(expiredRequest).not.toBeNull();
     expect(expiredRequest!.status).toBe('expired');
-    expect(expiredRequest!.expiredReason).toBe('superseded');
-    expect(expiredRequest!.supersededByRequestId).toBe(secondRequest!.id);
-    expect(expiredRequest!.supersededAt).not.toBeNull();
 
     controller.destroy();
   });
@@ -1671,7 +1672,7 @@ describe('call-controller', () => {
     await controller.handleCallerUtterance('Send email to Bob');
     await new Promise((r) => setTimeout(r, 50));
 
-    const firstRequest = getPendingRequestByCallSessionId(session.id);
+    const firstRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(firstRequest).not.toBeNull();
     expect(firstRequest!.toolName).toBe('send_email');
 
@@ -1685,7 +1686,7 @@ describe('call-controller', () => {
     await new Promise((r) => setTimeout(r, 50));
 
     // Should coalesce: the inherited tool metadata matches the existing consultation
-    const currentRequest = getPendingRequestByCallSessionId(session.id);
+    const currentRequest = getPendingCanonicalRequestByCallSessionId(session.id);
     expect(currentRequest!.id).toBe(firstRequest!.id);
     expect(currentRequest!.status).toBe('pending');
 

package/src/__tests__/call-routes-http.test.ts

@@ -47,6 +47,8 @@ const mockCallsConfig = {
 
 mock.module('../config/loader.js', () => ({
   getConfig: () => ({
+    ui: {},
+    
     model: 'test',
     provider: 'test',
     apiKeys: {},
@@ -227,8 +229,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('conversationId');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('conversationId');
 
     await stopServer();
   });
@@ -269,8 +271,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('E.164');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('E.164');
 
     await stopServer();
   });
@@ -285,8 +287,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('Invalid JSON');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('Invalid JSON');
 
     await stopServer();
   });
@@ -309,8 +311,8 @@ describe('runtime call routes — HTTP layer', () => {
     // user_number mode requires a configured user phone number;
     // since we haven't set one, this should return a 400 explaining why
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('user_number');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('user_number');
 
     await stopServer();
   });
@@ -364,11 +366,11 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('Invalid callerIdentityMode');
-    expect(body.error).toContain('bogus');
-    expect(body.error).toContain('assistant_number');
-    expect(body.error).toContain('user_number');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('Invalid callerIdentityMode');
+    expect(body.error.message).toContain('bogus');
+    expect(body.error.message).toContain('assistant_number');
+    expect(body.error.message).toContain('user_number');
 
     await stopServer();
   });
@@ -510,8 +512,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('Invalid JSON');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('Invalid JSON');
 
     await stopServer();
   });
@@ -533,9 +535,9 @@ describe('runtime call routes — HTTP layer', () => {
       body: JSON.stringify({ answer: 'Yes, please' }),
     });
 
-    expect(res.status).toBe(404);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('pending question');
+    expect(res.status).toBe(409);
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('No active controller');
 
     await stopServer();
   });
@@ -583,8 +585,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(409);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('orchestrator');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('No active controller');
 
     await stopServer();
   });
@@ -609,8 +611,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('Invalid JSON');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('Invalid JSON');
 
     await stopServer();
   });
@@ -633,8 +635,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('instructionText');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('instructionText');
 
     await stopServer();
   });
@@ -657,8 +659,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(400);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('instructionText');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('instructionText');
 
     await stopServer();
   });
@@ -673,8 +675,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(404);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('No call session found');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('No call session found');
 
     await stopServer();
   });
@@ -699,8 +701,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(409);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('not active');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('not active');
 
     await stopServer();
   });
@@ -723,8 +725,8 @@ describe('runtime call routes — HTTP layer', () => {
     });
 
     expect(res.status).toBe(409);
-    const body = await res.json() as { error: string };
-    expect(body.error).toContain('orchestrator');
+    const body = await res.json() as { error: { message: string; code?: string } };
+    expect(body.error.message).toContain('No active controller');
 
     await stopServer();
   });

package/src/__tests__/call-start-guardian-guard.test.ts

@@ -11,6 +11,8 @@ let activeVoiceSession: {
 
 mock.module('../config/loader.js', () => ({
   getConfig: () => ({
+    ui: {},
+    
     calls: { enabled: callsEnabled },
   }),
 }));