@vellumai/assistant 0.3.16 → 0.3.19

package/src/__tests__/guardian-grant-minting.test.ts

@@ -0,0 +1,543 @@
+/**
+ * Tests for M3: scoped grant minting on guardian tool-approval decisions.
+ *
+ * When a guardian approves a tool-approval request (one with toolName + input),
+ * the approval interception flow should mint a `tool_signature` scoped grant.
+ * Non-tool-approval requests and rejections must NOT mint grants.
+ */
+
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterAll, beforeEach, describe, expect, mock, spyOn, test } from 'bun:test';
+
+// ---------------------------------------------------------------------------
+// Test isolation: in-memory SQLite via temp directory
+// ---------------------------------------------------------------------------
+
+const testDir = mkdtempSync(join(tmpdir(), 'guardian-grant-minting-test-'));
+
+mock.module('../util/platform.js', () => ({
+  getRootDir: () => testDir,
+  getDataDir: () => testDir,
+  isMacOS: () => process.platform === 'darwin',
+  isLinux: () => process.platform === 'linux',
+  isWindows: () => process.platform === 'win32',
+  getSocketPath: () => join(testDir, 'test.sock'),
+  getPidPath: () => join(testDir, 'test.pid'),
+  getDbPath: () => join(testDir, 'test.db'),
+  getLogPath: () => join(testDir, 'test.log'),
+  ensureDataDir: () => {},
+}));
+
+mock.module('../util/logger.js', () => ({
+  getLogger: () => new Proxy({} as Record<string, unknown>, {
+    get: () => () => {},
+  }),
+}));
+
+import type { Session } from '../daemon/session.js';
+import {
+  createApprovalRequest,
+  createBinding,
+  getAllPendingApprovalsByGuardianChat,
+  type GuardianApprovalRequest,
+} from '../memory/channel-guardian-store.js';
+import { initializeDb, resetDb } from '../memory/db.js';
+import * as scopedGrantStore from '../memory/scoped-approval-grants.js';
+import { computeToolApprovalDigest } from '../security/tool-approval-digest.js';
+import * as approvalMessageComposer from '../runtime/approval-message-composer.js';
+import * as gatewayClient from '../runtime/gateway-client.js';
+import * as pendingInteractions from '../runtime/pending-interactions.js';
+import {
+  handleApprovalInterception,
+  GRANT_TTL_MS,
+} from '../runtime/routes/guardian-approval-interception.js';
+import type { GuardianContext } from '../runtime/routes/channel-route-shared.js';
+
+initializeDb();
+
+afterAll(() => {
+  resetDb();
+  try { rmSync(testDir, { recursive: true }); } catch { /* best effort */ }
+});
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+const ASSISTANT_ID = 'self';
+const GUARDIAN_USER = 'guardian-user-1';
+const GUARDIAN_CHAT = 'guardian-chat-1';
+const REQUESTER_USER = 'requester-user-1';
+const REQUESTER_CHAT = 'requester-chat-1';
+const CONVERSATION_ID = 'conv-1';
+const TOOL_NAME = 'execute_shell';
+const TOOL_INPUT = { command: 'rm -rf /tmp/test' };
+
+function resetTables(): void {
+  try {
+    const { getDb } = require('../memory/db.js');
+    const db = getDb();
+    db.run('DELETE FROM channel_guardian_approval_requests');
+    db.run('DELETE FROM scoped_approval_grants');
+  } catch { /* tables may not exist yet */ }
+  pendingInteractions.clear();
+}
+
+function createTestGuardianApproval(
+  requestId: string,
+  overrides: Partial<Parameters<typeof createApprovalRequest>[0]> = {},
+): GuardianApprovalRequest {
+  return createApprovalRequest({
+    runId: `run-${requestId}`,
+    requestId,
+    conversationId: CONVERSATION_ID,
+    assistantId: ASSISTANT_ID,
+    channel: 'telegram',
+    requesterExternalUserId: REQUESTER_USER,
+    requesterChatId: REQUESTER_CHAT,
+    guardianExternalUserId: GUARDIAN_USER,
+    guardianChatId: GUARDIAN_CHAT,
+    toolName: TOOL_NAME,
+    expiresAt: Date.now() + 300_000,
+    ...overrides,
+  });
+}
+
+function registerPendingInteraction(
+  requestId: string,
+  conversationId: string,
+  toolName: string,
+  input: Record<string, unknown> = TOOL_INPUT,
+): ReturnType<typeof mock> {
+  const handleConfirmationResponse = mock(() => {});
+  const mockSession = {
+    handleConfirmationResponse,
+  } as unknown as Session;
+
+  pendingInteractions.register(requestId, {
+    session: mockSession,
+    conversationId,
+    kind: 'confirmation',
+    confirmationDetails: {
+      toolName,
+      input,
+      riskLevel: 'high',
+      allowlistOptions: [
+        { label: 'test', description: 'test', pattern: 'test' },
+      ],
+      scopeOptions: [
+        { label: 'everywhere', scope: 'everywhere' },
+      ],
+    },
+  });
+
+  return handleConfirmationResponse;
+}
+
+function makeGuardianContext(): GuardianContext {
+  return {
+    actorRole: 'guardian',
+    denialReason: undefined,
+  };
+}
+
+function makeNonGuardianContext(): GuardianContext {
+  return {
+    actorRole: 'non-guardian',
+    denialReason: undefined,
+  };
+}
+
+function countGrants(): number {
+  try {
+    const { getDb } = require('../memory/db.js');
+    const db = getDb();
+    const row = db.$client.prepare('SELECT count(*) as cnt FROM scoped_approval_grants').get() as { cnt: number };
+    return row.cnt;
+  } catch {
+    return 0;
+  }
+}
+
+function getLatestGrant(): Record<string, unknown> | null {
+  try {
+    const { getDb } = require('../memory/db.js');
+    const db = getDb();
+    const row = db.$client.prepare('SELECT * FROM scoped_approval_grants ORDER BY created_at DESC LIMIT 1').get();
+    return (row as Record<string, unknown>) ?? null;
+  } catch {
+    return null;
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Tests
+// ═══════════════════════════════════════════════════════════════════════════
+
+describe('guardian grant minting on tool-approval decisions', () => {
+  let deliverSpy: ReturnType<typeof spyOn>;
+  let composeSpy: ReturnType<typeof spyOn>;
+
+  beforeEach(() => {
+    resetTables();
+    deliverSpy = spyOn(gatewayClient, 'deliverChannelReply').mockResolvedValue(undefined);
+    composeSpy = spyOn(approvalMessageComposer, 'composeApprovalMessageGenerative')
+      .mockResolvedValue('test message');
+  });
+
+  // ── 1. approve_once via callback mints a grant ──
+
+  test('approve_once via callback for tool-approval request mints a scoped grant', async () => {
+    const requestId = 'req-grant-cb-1';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-1',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // Verify a grant was minted
+    expect(countGrants()).toBe(1);
+
+    const grant = getLatestGrant();
+    expect(grant).not.toBeNull();
+    expect(grant!.scope_mode).toBe('tool_signature');
+    expect(grant!.tool_name).toBe(TOOL_NAME);
+    expect(grant!.status).toBe('active');
+    expect(grant!.request_channel).toBe('telegram');
+    expect(grant!.decision_channel).toBe('telegram');
+    expect(grant!.guardian_external_user_id).toBe(GUARDIAN_USER);
+    expect(grant!.requester_external_user_id).toBe(REQUESTER_USER);
+    expect(grant!.conversation_id).toBe(CONVERSATION_ID);
+    expect(grant!.execution_channel).toBeNull();
+    expect(grant!.call_session_id).toBeNull();
+
+    // Verify the input digest matches what computeToolApprovalDigest produces
+    const expectedDigest = computeToolApprovalDigest(TOOL_NAME, TOOL_INPUT);
+    expect(grant!.input_digest).toBe(expectedDigest);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 2. approve_once for non-tool-approval does NOT mint a grant ──
+
+  test('approve_once for informational request (no toolName) does NOT mint a grant', async () => {
+    const requestId = 'req-no-grant-1';
+    // Informational requests have no meaningful tool name — the empty string
+    // signals that this is not a tool-approval request.
+    createTestGuardianApproval(requestId, { toolName: '' });
+    registerPendingInteraction(requestId, CONVERSATION_ID, '', {});
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-2',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // No grant should have been minted
+    expect(countGrants()).toBe(0);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 2b. approve_once for zero-argument tool call DOES mint a grant ──
+
+  test('approve_once for zero-argument tool call mints a scoped grant', async () => {
+    const requestId = 'req-grant-zero-arg';
+    const zeroArgTool = 'get_system_status';
+    createTestGuardianApproval(requestId, { toolName: zeroArgTool });
+    // Register with empty input object to simulate a zero-argument tool call
+    registerPendingInteraction(requestId, CONVERSATION_ID, zeroArgTool, {});
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-2b',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // A grant MUST be minted even though input is {}
+    expect(countGrants()).toBe(1);
+
+    const grant = getLatestGrant();
+    expect(grant).not.toBeNull();
+    expect(grant!.scope_mode).toBe('tool_signature');
+    expect(grant!.tool_name).toBe(zeroArgTool);
+    expect(grant!.status).toBe('active');
+
+    // Verify the input digest matches what computeToolApprovalDigest produces for empty input
+    const expectedDigest = computeToolApprovalDigest(zeroArgTool, {});
+    expect(grant!.input_digest).toBe(expectedDigest);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 3. reject does NOT mint a grant ──
+
+  test('reject decision does NOT mint a scoped grant', async () => {
+    const requestId = 'req-no-grant-rej';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-3',
+      callbackData: `apr:${requestId}:reject`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // No grant should have been minted
+    expect(countGrants()).toBe(0);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 4. Identity mismatch remains fail-closed (no grant minted) ──
+
+  test('identity mismatch does NOT mint a grant and fails closed', async () => {
+    const requestId = 'req-mismatch-1';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-4',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: 'wrong-guardian-user',
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    // Identity mismatch results in guardian_decision_applied (fail-closed, no actual decision applied)
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // No grant should have been minted
+    expect(countGrants()).toBe(0);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 5. Stale/already-resolved request does NOT mint a grant ──
+
+  test('stale request (already resolved) does NOT mint a grant', async () => {
+    const requestId = 'req-stale-1';
+    // Create guardian approval but do NOT register a pending interaction
+    // This simulates the pending interaction being already resolved
+    createTestGuardianApproval(requestId);
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-5',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('stale_ignored');
+
+    // No grant should have been minted
+    expect(countGrants()).toBe(0);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 6. approve_once via conversation engine mints a grant ──
+
+  test('approve_once via conversation engine mints a scoped grant', async () => {
+    const requestId = 'req-grant-eng-1';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const mockGenerator = async () => ({
+      disposition: 'approve_once' as const,
+      replyText: 'Approved!',
+      targetRequestId: requestId,
+    });
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-6',
+      content: 'yes, approve it',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+      approvalConversationGenerator: mockGenerator,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // Verify a grant was minted
+    expect(countGrants()).toBe(1);
+
+    const grant = getLatestGrant();
+    expect(grant).not.toBeNull();
+    expect(grant!.scope_mode).toBe('tool_signature');
+    expect(grant!.tool_name).toBe(TOOL_NAME);
+    expect(grant!.status).toBe('active');
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 7. reject via conversation engine does NOT mint a grant ──
+
+  test('reject via conversation engine does NOT mint a grant', async () => {
+    const requestId = 'req-no-grant-eng-rej';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const mockGenerator = async () => ({
+      disposition: 'reject' as const,
+      replyText: 'Denied.',
+      targetRequestId: requestId,
+    });
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-7',
+      content: 'no, deny it',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+      approvalConversationGenerator: mockGenerator,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // No grant should have been minted
+    expect(countGrants()).toBe(0);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 8. approve_once via legacy parser mints a grant ──
+
+  test('approve_once via legacy parser mints a scoped grant', async () => {
+    const requestId = 'req-grant-leg-1';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    // No approvalConversationGenerator => legacy parser path
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-8',
+      content: 'yes',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.handled).toBe(true);
+    expect(result.type).toBe('guardian_decision_applied');
+
+    // Verify a grant was minted
+    expect(countGrants()).toBe(1);
+
+    const grant = getLatestGrant();
+    expect(grant).not.toBeNull();
+    expect(grant!.scope_mode).toBe('tool_signature');
+    expect(grant!.tool_name).toBe(TOOL_NAME);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+
+  // ── 9. Grant TTL is approximately 5 minutes ──
+
+  test('minted grant has approximately 5-minute TTL', async () => {
+    const requestId = 'req-grant-ttl-1';
+    createTestGuardianApproval(requestId);
+    registerPendingInteraction(requestId, CONVERSATION_ID, TOOL_NAME, TOOL_INPUT);
+
+    const beforeTime = Date.now();
+
+    const result = await handleApprovalInterception({
+      conversationId: 'guardian-conv-9',
+      callbackData: `apr:${requestId}:approve_once`,
+      content: '',
+      externalChatId: GUARDIAN_CHAT,
+      sourceChannel: 'telegram',
+      senderExternalUserId: GUARDIAN_USER,
+      replyCallbackUrl: 'https://gateway.test/deliver',
+      guardianCtx: makeGuardianContext(),
+      assistantId: ASSISTANT_ID,
+    });
+
+    expect(result.type).toBe('guardian_decision_applied');
+
+    const grant = getLatestGrant();
+    expect(grant).not.toBeNull();
+
+    const expiresAt = new Date(grant!.expires_at as string).getTime();
+    const expectedMin = beforeTime + GRANT_TTL_MS - 1000; // 1s tolerance
+    const expectedMax = beforeTime + GRANT_TTL_MS + 5000;  // 5s tolerance
+    expect(expiresAt).toBeGreaterThanOrEqual(expectedMin);
+    expect(expiresAt).toBeLessThanOrEqual(expectedMax);
+
+    deliverSpy.mockRestore();
+    composeSpy.mockRestore();
+  });
+});

package/src/__tests__/ipc-snapshot.test.ts

@@ -727,6 +727,10 @@ const clientMessages: Record<ClientMessageType, ClientMessage> = {
     type: 'heartbeat_checklist_write',
     content: '- [ ] Check email\n- [ ] Review PRs',
   },
+  voice_config_update: {
+    type: 'voice_config_update',
+    activationKey: 'fn',
+  },
 };
 
 // ---------------------------------------------------------------------------
@@ -1077,6 +1081,7 @@ const serverMessages: Record<ServerMessageType, ServerMessage> = {
         degraded: false,
         updateAvailable: false,
         userInvocable: true,
+        provenance: { kind: 'first-party', provider: 'Vellum' },
       },
     ],
   },
@@ -1998,6 +2003,23 @@ const serverMessages: Record<ServerMessageType, ServerMessage> = {
     type: 'heartbeat_checklist_write_response',
     success: true,
   },
+  navigate_settings: {
+    type: 'navigate_settings',
+    tab: 'general',
+  },
+  client_settings_update: {
+    type: 'client_settings_update',
+    key: 'activationKey',
+    value: 'fn',
+  },
+  identity_changed: {
+    type: 'identity_changed',
+    name: 'Vellum',
+    role: 'assistant',
+    personality: 'friendly',
+    emoji: '',
+    home: '',
+  },
 };
 
 // ---------------------------------------------------------------------------

package/src/__tests__/non-member-access-request.test.ts

@@ -84,7 +84,7 @@ import {
   createBinding,
   findPendingAccessRequestForRequester,
 } from '../memory/channel-guardian-store.js';
-import { initializeDb, resetDb } from '../memory/db.js';
+import { getDb, initializeDb, resetDb } from '../memory/db.js';
 import { handleChannelInbound } from '../runtime/routes/channel-routes.js';
 
 initializeDb();
@@ -101,7 +101,6 @@ afterAll(() => {
 const TEST_BEARER_TOKEN = 'test-token';
 
 function resetState(): void {
-  const { getDb } = require('../memory/db.js');
   const db = getDb();
   db.run('DELETE FROM channel_guardian_approval_requests');
   db.run('DELETE FROM channel_guardian_bindings');