@vellumai/assistant 0.4.26 → 0.4.30

package/src/runtime/approval-message-composer.ts

@@ -6,36 +6,36 @@
  *   2. Generator-produced rewrite of deterministic fallback text (when provided by daemon)
  *   3. Deterministic fallback templates (natural, scenario-specific messages)
  */
-import { getLogger } from '../util/logger.js';
-import type { ApprovalCopyGenerator } from './http-types.js';
+import { getLogger } from "../util/logger.js";
+import type { ApprovalCopyGenerator } from "./http-types.js";
 
-const log = getLogger('approval-message-composer');
+const log = getLogger("approval-message-composer");
 
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
 
 export type ApprovalMessageScenario =
-  | 'standard_prompt'
-  | 'guardian_prompt'
-  | 'reminder_prompt'
-  | 'guardian_delivery_failed'
-  | 'guardian_request_forwarded'
-  | 'guardian_disambiguation'
-  | 'guardian_identity_mismatch'
-  | 'request_pending_guardian'
-  | 'guardian_decision_outcome'
-  | 'guardian_expired_requester'
-  | 'guardian_expired_guardian'
-  | 'guardian_verify_success'
-  | 'guardian_verify_failed'
-  | 'guardian_verify_challenge_setup'
-  | 'guardian_verify_status_bound'
-  | 'guardian_verify_status_unbound'
-  | 'guardian_deny_no_identity'
-  | 'guardian_deny_no_binding'
-  | 'requester_cancel'
-  | 'approval_already_resolved';
+  | "standard_prompt"
+  | "guardian_prompt"
+  | "reminder_prompt"
+  | "guardian_delivery_failed"
+  | "guardian_request_forwarded"
+  | "guardian_disambiguation"
+  | "guardian_identity_mismatch"
+  | "request_pending_guardian"
+  | "guardian_decision_outcome"
+  | "guardian_expired_requester"
+  | "guardian_expired_guardian"
+  | "guardian_verify_success"
+  | "guardian_verify_failed"
+  | "guardian_verify_challenge_setup"
+  | "guardian_verify_status_bound"
+  | "guardian_verify_status_unbound"
+  | "guardian_deny_no_identity"
+  | "guardian_deny_no_binding"
+  | "requester_cancel"
+  | "approval_already_resolved";
 
 export interface ApprovalMessageContext {
   scenario: ApprovalMessageScenario;
@@ -44,7 +44,7 @@ export interface ApprovalMessageContext {
   requesterIdentifier?: string;
   guardianIdentifier?: string;
   pendingCount?: number;
-  decision?: 'approved' | 'denied';
+  decision?: "approved" | "denied";
   richUi?: boolean;
   /** Pre-existing assistant text to reuse (macOS parity). */
   assistantPreface?: string;
@@ -78,7 +78,9 @@ export interface ComposeApprovalMessageGenerativeOptions {
  *   1. If an assistant preface is provided and non-empty, return it directly.
  *   2. Otherwise fall back to a deterministic scenario-specific template.
  */
-export function composeApprovalMessage(context: ApprovalMessageContext): string {
+export function composeApprovalMessage(
+  context: ApprovalMessageContext,
+): string {
   if (context.assistantPreface && context.assistantPreface.trim().length > 0) {
     return context.assistantPreface;
   }
@@ -88,14 +90,17 @@ export function composeApprovalMessage(context: ApprovalMessageContext): string
 
 /** @internal Exported for use by the daemon-injected generator implementation. */
 export function escapeRegExp(input: string): string {
-  return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 /** @internal Exported for use by the daemon-injected generator implementation. */
-export function includesRequiredKeywords(text: string, requiredKeywords: string[] | undefined): boolean {
+export function includesRequiredKeywords(
+  text: string,
+  requiredKeywords: string[] | undefined,
+): boolean {
   if (!requiredKeywords || requiredKeywords.length === 0) return true;
   return requiredKeywords.every((keyword) => {
-    const re = new RegExp(`\\b${escapeRegExp(keyword)}\\b`, 'i');
+    const re = new RegExp(`\\b${escapeRegExp(keyword)}\\b`, "i");
     return re.test(text);
   });
 }
@@ -106,26 +111,31 @@ export function buildGenerationPrompt(
   fallbackText: string,
   requiredKeywords: string[] | undefined,
 ): string {
-  const keywordClause = requiredKeywords && requiredKeywords.length > 0
-    ? `Required words to include (as standalone words): ${requiredKeywords.join(', ')}.\n`
-    : '';
+  const keywordClause =
+    requiredKeywords && requiredKeywords.length > 0
+      ? `Required words to include (as standalone words): ${requiredKeywords.join(
+          ", ",
+        )}.\n`
+      : "";
   return [
-    'Rewrite the following approval/guardian message as a natural assistant reply to the user.',
-    'Keep the same concrete facts and next-step guidance.',
+    "Rewrite the following approval/guardian message as a natural assistant reply to the user.",
+    "Keep the same concrete facts and next-step guidance.",
     keywordClause,
     `Context JSON: ${JSON.stringify(context)}`,
     `Fallback message: ${fallbackText}`,
-  ].filter(Boolean).join('\n\n');
+  ]
+    .filter(Boolean)
+    .join("\n\n");
 }
 
 /** Constants for the generator implementation (moved to exports for daemon lifecycle). */
 export const APPROVAL_COPY_TIMEOUT_MS = 4_000;
 export const APPROVAL_COPY_MAX_TOKENS = 180;
 export const APPROVAL_COPY_SYSTEM_PROMPT =
-  'You are an assistant writing one user-facing message about permissions/approval state. '
-  + 'Keep it concise, natural, and actionable. Preserve factual details exactly. '
-  + 'Do not mention internal systems, scenario IDs, or policy engine details. '
-  + 'Return plain text only.';
+  "You are an assistant writing one user-facing message about permissions/approval state. " +
+  "Keep it concise, natural, and actionable. Preserve factual details exactly. " +
+  "Do not mention internal systems, scenario IDs, or policy engine details. " +
+  "Return plain text only.";
 
 /**
  * Compose user-facing approval copy using the daemon-injected generator when
@@ -144,9 +154,10 @@ export async function composeApprovalMessageGenerative(
     return context.assistantPreface;
   }
 
-  const fallbackText = options.fallbackText?.trim() || getFallbackMessage(context);
+  const fallbackText =
+    options.fallbackText?.trim() || getFallbackMessage(context);
 
-  if (process.env.NODE_ENV === 'test') {
+  if (process.env.NODE_ENV === "test") {
     return fallbackText;
   }
 
@@ -155,7 +166,10 @@ export async function composeApprovalMessageGenerative(
       const generated = await generator(context, options);
       if (generated) return generated;
     } catch (err) {
-      log.warn({ err, scenario: context.scenario }, 'Failed to generate approval copy, using fallback');
+      log.warn(
+        { err, scenario: context.scenario },
+        "Failed to generate approval copy, using fallback",
+      );
     }
   }
 
@@ -175,57 +189,75 @@ export async function composeApprovalMessageGenerative(
  */
 export function getFallbackMessage(context: ApprovalMessageContext): string {
   switch (context.scenario) {
-    case 'standard_prompt':
-      return `I'd like to use the tool "${context.toolName ?? 'unknown'}". Would you like to allow this?`;
-
-    case 'guardian_prompt':
-      return `${context.requesterIdentifier ?? 'A user'} is requesting to use "${context.toolName ?? 'unknown'}". Please approve or deny this request.`;
-
-    case 'reminder_prompt':
-      return 'There is a pending approval request. Ask a follow-up question or say approve/deny when you are ready.';
-
-    case 'guardian_delivery_failed':
+    case "standard_prompt":
+      return `I'd like to use the tool "${
+        context.toolName ?? "unknown"
+      }". Would you like to allow this?`;
+
+    case "guardian_prompt":
+      return `${
+        context.requesterIdentifier ?? "A user"
+      } is requesting to use "${
+        context.toolName ?? "unknown"
+      }". Please approve or deny this request.`;
+
+    case "reminder_prompt":
+      return "There is a pending approval request. Ask a follow-up question or say approve/deny when you are ready.";
+
+    case "guardian_delivery_failed":
       return context.toolName
         ? `Your request to run "${context.toolName}" could not be sent to the guardian for approval. The request has been denied for safety.`
         : "I wasn't able to reach the guardian to request approval. The request has been denied for safety.";
 
-    case 'guardian_request_forwarded':
-      return `Your request to use "${context.toolName ?? 'unknown'}" has been forwarded to the guardian for approval. I'll let you know once they decide.`;
+    case "guardian_request_forwarded":
+      return `Your request to use "${
+        context.toolName ?? "unknown"
+      }" has been forwarded to the guardian for approval. I'll let you know once they decide.`;
 
-    case 'guardian_disambiguation':
-      return `There are ${context.pendingCount ?? 'multiple'} pending approval requests. Please use the approval buttons to specify which request you're responding to.`;
+    case "guardian_disambiguation":
+      return `There are ${
+        context.pendingCount ?? "multiple"
+      } pending approval requests. Please use the approval buttons to specify which request you're responding to.`;
 
-    case 'guardian_identity_mismatch':
-      return 'This approval request can only be handled by the designated guardian.';
+    case "guardian_identity_mismatch":
+      return "This approval request can only be handled by the designated guardian.";
 
-    case 'request_pending_guardian':
-      return 'Your request is pending guardian approval. Please wait for the guardian to respond.';
+    case "request_pending_guardian":
+      return "Your request is pending guardian approval. Please wait for the guardian to respond.";
 
-    case 'guardian_decision_outcome':
-      return `The guardian has ${context.decision ?? 'decided on'} your request to use "${context.toolName ?? 'unknown'}".`;
+    case "guardian_decision_outcome":
+      return `The guardian has ${
+        context.decision ?? "decided on"
+      } your request to use "${context.toolName ?? "unknown"}".`;
 
-    case 'guardian_expired_requester':
-      return `The approval request for "${context.toolName ?? 'unknown'}" has expired without a guardian response. The request has been denied.`;
+    case "guardian_expired_requester":
+      return `The approval request for "${
+        context.toolName ?? "unknown"
+      }" has expired without a guardian response. The request has been denied.`;
 
-    case 'guardian_expired_guardian':
-      return `The approval request from ${context.requesterIdentifier ?? 'the requester'} for "${context.toolName ?? 'unknown'}" has expired.`;
+    case "guardian_expired_guardian":
+      return `The approval request from ${
+        context.requesterIdentifier ?? "the requester"
+      } for "${context.toolName ?? "unknown"}" has expired.`;
 
-    case 'guardian_verify_success':
-      return 'Guardian verification successful! You are now set as the guardian for this channel.';
+    case "guardian_verify_success":
+      return "Guardian verification successful! You are now set as the guardian for this channel.";
 
-    case 'guardian_verify_failed':
-      return `Verification failed. ${context.failureReason ?? 'Please try again.'}`;
+    case "guardian_verify_failed":
+      return `Verification failed. ${
+        context.failureReason ?? "Please try again."
+      }`;
 
-    case 'guardian_verify_challenge_setup': {
+    case "guardian_verify_challenge_setup": {
       // The instruction must include the code so the macOS client (and other
       // consumers) can parse it from the instruction text.  The
       // "<N>-digit code: <code>" format is shared across channels for
       // consistency; wording adapts to channel and code type.
-      const code = context.verifyCommand ?? 'the verification code';
+      const code = context.verifyCommand ?? "the verification code";
       // Detect whether the code is a short numeric (identity-bound outbound)
       // or a high-entropy hex (inbound challenge/bootstrap) and adjust wording.
       const isNumeric = /^\d{4,8}$/.test(code);
-      if (context.channel === 'voice') {
+      if (context.channel === "voice") {
         if (isNumeric) {
           return `To complete guardian verification, speak or enter the ${code.length}-digit code: ${code}.`;
         }
@@ -237,25 +269,25 @@ export function getFallbackMessage(context: ApprovalMessageContext): string {
       return `To complete guardian verification, send the code: ${code}.`;
     }
 
-    case 'guardian_verify_status_bound':
-      return 'A guardian is currently active for this channel.';
+    case "guardian_verify_status_bound":
+      return "A guardian is currently active for this channel.";
 
-    case 'guardian_verify_status_unbound':
-      return 'No guardian is currently configured for this channel.';
+    case "guardian_verify_status_unbound":
+      return "No guardian is currently configured for this channel.";
 
-    case 'guardian_deny_no_identity':
-      return 'This action requires approval, but your identity could not be verified. The request has been denied for safety.';
+    case "guardian_deny_no_identity":
+      return "This action requires approval, but your identity could not be verified. The request has been denied for safety.";
 
-    case 'guardian_deny_no_binding':
-      return 'This action requires guardian approval, but no guardian has been configured for this channel. The request has been denied for safety.';
+    case "guardian_deny_no_binding":
+      return "This action requires guardian approval, but no guardian has been configured for this channel. The request has been denied for safety.";
 
-    case 'requester_cancel':
+    case "requester_cancel":
       return context.toolName
         ? `Your request to use "${context.toolName}" has been cancelled.`
-        : 'Your pending request has been cancelled.';
+        : "Your pending request has been cancelled.";
 
-    case 'approval_already_resolved':
-      return 'This approval request has already been resolved.';
+    case "approval_already_resolved":
+      return "This approval request has already been resolved.";
 
     default: {
       // Exhaustive check — TypeScript will flag if a scenario is missing.

package/src/runtime/assistant-event-hub.ts

@@ -6,7 +6,7 @@
  * integration is wired here.
  */
 
-import type { AssistantEvent } from './assistant-event.js';
+import type { AssistantEvent } from "./assistant-event.js";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
 
@@ -18,7 +18,9 @@ export type AssistantEventFilter = {
   sessionId?: string;
 };
 
-export type AssistantEventCallback = (event: AssistantEvent) => void | Promise<void>;
+export type AssistantEventCallback = (
+  event: AssistantEvent,
+) => void | Promise<void>;
 
 /** Opaque handle returned by `subscribe`. Call `dispose()` to remove the subscription. */
 export interface AssistantEventSubscription {
@@ -83,9 +85,18 @@ export class AssistantEventHub {
       }
       oldest.active = false;
       this.subscribers.delete(oldest);
-      try { oldest.onEvict?.(); } catch { /* ignore eviction callback errors */ }
+      try {
+        oldest.onEvict?.();
+      } catch {
+        /* ignore eviction callback errors */
+      }
     }
-    const entry: SubscriberEntry = { filter, callback, active: true, onEvict: options?.onEvict };
+    const entry: SubscriberEntry = {
+      filter,
+      callback,
+      active: true,
+      onEvict: options?.onEvict,
+    };
     this.subscribers.add(entry);
 
     return {
@@ -125,7 +136,12 @@ export class AssistantEventHub {
       if (entry.filter.assistantId !== event.assistantId) continue;
       // System events (no sessionId) match all subscribers; scoped events
       // must match the subscriber's sessionId filter when present.
-      if (event.sessionId != null && entry.filter.sessionId != null && entry.filter.sessionId !== event.sessionId) continue;
+      if (
+        event.sessionId != null &&
+        entry.filter.sessionId != null &&
+        entry.filter.sessionId !== event.sessionId
+      )
+        continue;
       try {
         await entry.callback(event);
       } catch (err) {
@@ -134,7 +150,10 @@ export class AssistantEventHub {
     }
 
     if (errors.length > 0) {
-      throw new AggregateError(errors, 'One or more assistant-event subscribers threw');
+      throw new AggregateError(
+        errors,
+        "One or more assistant-event subscribers threw",
+      );
     }
   }
 

package/src/runtime/assistant-event.ts

@@ -6,9 +6,9 @@
  * assistant events without creating circular dependencies.
  */
 
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
 
-import type { ServerMessage } from '../daemon/ipc-protocol.js';
+import type { ServerMessage } from "../daemon/ipc-protocol.js";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
 
@@ -69,7 +69,7 @@ export function buildAssistantEvent(
  * ```
  */
 export function formatSseFrame(event: AssistantEvent): string {
-  const sanitizedId = event.id.replace(/[\n\r]/g, '');
+  const sanitizedId = event.id.replace(/[\n\r]/g, "");
   const data = JSON.stringify(event);
   return `event: assistant_event\nid: ${sanitizedId}\ndata: ${data}\n\n`;
 }
@@ -79,5 +79,5 @@ export function formatSseFrame(event: AssistantEvent): string {
  * Clients should ignore comment lines (`:`) per the SSE spec.
  */
 export function formatSseHeartbeat(): string {
-  return ': heartbeat\n\n';
+  return ": heartbeat\n\n";
 }

package/src/runtime/assistant-scope.ts

@@ -7,4 +7,4 @@
  * should never derive scoping decisions from externally-provided assistant
  * IDs — use this constant instead.
  */
-export const DAEMON_INTERNAL_ASSISTANT_ID = 'self' as const;
+export const DAEMON_INTERNAL_ASSISTANT_ID = "self" as const;

package/src/runtime/auth/__tests__/guard-tests.test.ts

@@ -54,25 +54,47 @@ describe("route policy coverage", () => {
     const httpServerSrc = readFileSync(httpServerPath, "utf-8");
     const routePolicySrc = readFileSync(routePolicyPath, "utf-8");
 
-    // Extract endpoint strings from dispatchEndpoint. We look for patterns
-    // like `endpoint === 'foo'` which is the dispatch pattern.
-    const endpointMatches = httpServerSrc.matchAll(
-      /endpoint\s*===\s*'([^']+)'/g,
-    );
+    // Extract endpoint policy keys from the declarative route table returned
+    // by buildRouteTable(). Each route entry has an `endpoint` field and an
+    // optional `policyKey` override. When `policyKey` is present it takes
+    // precedence; otherwise the key is derived by stripping `:param` segments,
+    // mirroring HttpRouter.compileRoute().
+    const lines = httpServerSrc.split("\n");
     const dispatchedEndpoints = new Set<string>();
-    for (const m of endpointMatches) {
-      dispatchedEndpoints.add(m[1]);
+    for (let i = 0; i < lines.length; i++) {
+      const endpointMatch = lines[i].match(/endpoint:\s*"([^"]+)"/);
+      if (!endpointMatch) continue;
+
+      // Look ahead a few lines for an optional policyKey on the same route object.
+      let policyKey: string | null = null;
+      for (let j = i + 1; j < Math.min(i + 5, lines.length); j++) {
+        const pkMatch = lines[j].match(/policyKey:\s*"([^"]+)"/);
+        if (pkMatch) {
+          policyKey = pkMatch[1];
+          break;
+        }
+        // Stop at the next endpoint or closing brace (end of route object).
+        if (lines[j].match(/endpoint:\s*"/) || lines[j].trim() === "},") break;
+      }
+
+      const resolvedKey =
+        policyKey ??
+        endpointMatch[1]
+          .split("/")
+          .filter((s) => !s.startsWith(":"))
+          .join("/");
+      dispatchedEndpoints.add(resolvedKey);
     }
 
-    // These endpoints are handled in dispatchEndpoint but intentionally
-    // don't need a route policy (they are unprotected utility endpoints).
+    // These endpoints are in the route table but intentionally don't need
+    // a route policy (they are unprotected utility endpoints).
     const UNPROTECTED_ENDPOINTS = new Set(["health"]);
 
     // Extract registered policy endpoint strings from route-policy.ts.
     // Match: `{ endpoint: 'foo' }` entries, `registerPolicy('foo', ...)`
     // calls, and bare string literals in arrays like INTERNAL_ENDPOINTS.
     const policyEndpointMatches = routePolicySrc.matchAll(
-      /endpoint:\s*'([^']+)'|registerPolicy\(\s*'([^']+)'/g,
+      /endpoint:\s*"([^"]+)"|registerPolicy\(\s*"([^"]+)"/g,
     );
     const registeredPolicies = new Set<string>();
     for (const m of policyEndpointMatches) {
@@ -85,15 +107,15 @@ describe("route policy coverage", () => {
       /INTERNAL_ENDPOINTS\s*=\s*\[([\s\S]*?)\]/,
     );
     if (internalArrayMatch) {
-      const arrayLiterals = internalArrayMatch[1].matchAll(/'([^']+)'/g);
+      const arrayLiterals = internalArrayMatch[1].matchAll(/"([^"]+)"/g);
       for (const m of arrayLiterals) {
         registeredPolicies.add(m[1]);
       }
     }
 
-    // For method-specific dispatches like `endpoint === 'messages' && req.method === 'POST'`,
-    // the policy key might be `messages:POST` or just `messages`. We need to
-    // check that either the plain endpoint key or a method-qualified key exists.
+    // The policy key might be method-qualified (e.g. `messages:POST`) or plain
+    // (`messages`). Check that either the plain key or a method-qualified
+    // variant is registered.
     const missingPolicies: string[] = [];
     for (const endpoint of dispatchedEndpoints) {
       if (UNPROTECTED_ENDPOINTS.has(endpoint)) continue;

package/src/runtime/auth/context.ts

@@ -4,10 +4,10 @@
  * knowing about JWT internals.
  */
 
-import { DAEMON_INTERNAL_ASSISTANT_ID } from '../assistant-scope.js';
-import { resolveScopeProfile } from './scopes.js';
-import { parseSub } from './subject.js';
-import type { AuthContext, TokenClaims } from './types.js';
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
+import { resolveScopeProfile } from "./scopes.js";
+import { parseSub } from "./subject.js";
+import type { AuthContext, TokenClaims } from "./types.js";
 
 // ---------------------------------------------------------------------------
 // Result type
@@ -43,9 +43,10 @@ export function buildAuthContext(claims: TokenClaims): BuildAuthContextResult {
   // Daemon-audience tokens always scope to the internal assistant ID,
   // preventing external assistant IDs from leaking into daemon-side
   // storage and routing.
-  const assistantId = claims.aud === 'vellum-daemon'
-    ? DAEMON_INTERNAL_ASSISTANT_ID
-    : subResult.assistantId;
+  const assistantId =
+    claims.aud === "vellum-daemon"
+      ? DAEMON_INTERNAL_ASSISTANT_ID
+      : subResult.assistantId;
 
   const context: AuthContext = {
     subject: claims.sub,