@vellumai/assistant 0.6.5 → 0.7.0

package/src/runtime/http-types.ts

@@ -3,9 +3,7 @@
  */
 import type { ChannelId, InterfaceId } from "../channels/types.js";
 import type { LLMCallSite } from "../config/schemas/llm.js";
-import type { CesClient } from "../credential-execution/client.js";
 import type { Conversation } from "../daemon/conversation.js";
-import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
 import type {
   ConversationCreateOptions,
   SlackInboundMessageMetadata,
@@ -14,30 +12,24 @@ import type {
 // Re-export so route modules (background-dispatch, etc.) can pull the type
 // from the runtime barrel without reaching into daemon internals.
 export type { SlackInboundMessageMetadata };
-import type { SkillOperationContext } from "../daemon/handlers/skills.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEventHub } from "./assistant-event-hub.js";
 import type {
-  SurfaceData,
-  SurfaceType,
-} from "../daemon/message-types/surfaces.js";
-import type {
+  ApprovalCopyGenerator,
+  GuardianActionCopyGenerator,
+} from "./message-composer-types.js";
+
+export type {
+  ApprovalCopyGenerator,
   ApprovalMessageContext,
+  ApprovalMessageScenario,
   ComposeApprovalMessageGenerativeOptions,
-} from "./approval-message-composer.js";
-import type { AssistantEventHub } from "./assistant-event-hub.js";
-import type {
   ComposeGuardianActionMessageOptions,
+  GuardianActionCopyGenerator,
   GuardianActionMessageContext,
-} from "./guardian-action-message-composer.js";
-import type { ConversationManagementDeps } from "./routes/conversation-management-routes.js";
-/**
- * Daemon-injected function that generates approval copy using a provider.
- * Returns generated text or `null` on failure (caller falls back to deterministic text).
- */
-export type ApprovalCopyGenerator = (
-  context: ApprovalMessageContext,
-  options?: ComposeApprovalMessageGenerativeOptions,
-) => Promise<string | null>;
+  GuardianActionMessageScenario,
+} from "./message-composer-types.js";
+import type { TrustContext } from "../daemon/trust-context.js";
 
 // ---------------------------------------------------------------------------
 // Approval conversation flow types
@@ -47,9 +39,6 @@ export type ApprovalCopyGenerator = (
 export type ApprovalConversationDisposition =
   | "keep_pending"
   | "approve_once"
-  | "approve_10m"
-  | "approve_conversation"
-  | "approve_always"
   | "reject";
 
 /** Structured result from a single turn of the approval conversation. */
@@ -77,15 +66,6 @@ export type ApprovalConversationGenerator = (
   context: ApprovalConversationContext,
 ) => Promise<ApprovalConversationResult>;
 
-/**
- * Daemon-injected function that generates guardian action copy using a provider.
- * Returns generated text or `null` on failure (caller falls back to deterministic text).
- */
-export type GuardianActionCopyGenerator = (
-  context: GuardianActionMessageContext,
-  options?: ComposeGuardianActionMessageOptions,
-) => Promise<string | null>;
-
 // ---------------------------------------------------------------------------
 // Guardian follow-up conversation flow types
 // ---------------------------------------------------------------------------
@@ -191,11 +171,6 @@ export interface RuntimeHttpServerOptions {
   port?: number;
   /** Hostname / IP to bind to. Defaults to '127.0.0.1' (loopback-only). */
   hostname?: string;
-  /** Legacy shared secret for pairing routes (not used for delivery or auth). */
-  bearerToken?: string;
-  processMessage?: MessageProcessor;
-  /** Root directory for interface files on disk. */
-  interfacesDir?: string;
   /** Daemon-injected generator for approval copy (provider-backed). */
   approvalCopyGenerator?: ApprovalCopyGenerator;
   /** Daemon-injected generator for conversational approval flow (provider-backed). */
@@ -204,69 +179,6 @@ export interface RuntimeHttpServerOptions {
   guardianActionCopyGenerator?: GuardianActionCopyGenerator;
   /** Daemon-injected generator for guardian follow-up conversation (provider-backed). */
   guardianFollowUpConversationGenerator?: GuardianFollowUpConversationGenerator;
-  /** Dependencies for the POST /v1/messages queue-if-busy handler. */
-  sendMessageDeps?: SendMessageDeps;
-  /** Context provider for skill management HTTP routes. */
-  getSkillContext?: () => SkillOperationContext;
-  /** Lookup an active conversation by ID (for surface actions and content fetches). */
-  findConversation?: (conversationId: string) =>
-    | {
-        handleSurfaceAction(
-          surfaceId: string,
-          actionId: string,
-          data?: Record<string, unknown>,
-        ): void | Promise<unknown>;
-        surfaceState: Map<
-          string,
-          { surfaceType: SurfaceType; data: SurfaceData; title?: string }
-        >;
-        currentTurnSurfaces?: Array<{
-          surfaceId: string;
-          surfaceType: SurfaceType;
-          title?: string;
-          data: SurfaceData;
-          actions?: Array<{ id: string; label: string; style?: string }>;
-        }>;
-        removeQueuedMessage?: (requestId: string) => boolean;
-      }
-    | undefined;
-  /** Lookup an active conversation by surfaceId (fallback when conversationId is absent). */
-  findConversationBySurfaceId?: (surfaceId: string) =>
-    | {
-        handleSurfaceAction(
-          surfaceId: string,
-          actionId: string,
-          data?: Record<string, unknown>,
-        ): void | Promise<unknown>;
-        surfaceState: Map<
-          string,
-          { surfaceType: SurfaceType; data: SurfaceData; title?: string }
-        >;
-      }
-    | undefined;
-  /** Dependencies for conversation management HTTP routes (switch, rename, clear, cancel, undo, regenerate). */
-  conversationManagementDeps?: ConversationManagementDeps;
-  /** Lazy factory for model config set context (conversation eviction, config reload suppression). */
-  getModelSetContext?: () => import("../daemon/handlers/config-model.js").ModelSetContext;
-  /** Provider for watch observation dependencies (watch routes). */
-  getWatchDeps?: () => import("./routes/watch-routes.js").WatchDeps;
-  /** Provider for recording dependencies (recording routes). */
-  getRecordingDeps?: () => import("./routes/recording-routes.js").RecordingDeps;
-  /** Accessor for the CES client, used to push API key updates to CES after hatch. */
-  getCesClient?: () => CesClient | undefined;
-  /**
-   * Called after provider-affecting credentials reload so live conversations
-   * can be recreated with fresh provider instances.
-   */
-  onProviderCredentialsChanged?: () => void | Promise<void>;
-  /** Accessor for the heartbeat service (for run-now and config routes). */
-  getHeartbeatService?: () =>
-    | import("../heartbeat/heartbeat-service.js").HeartbeatService
-    | undefined;
-  /** Accessor for the filing service (for run-now and config routes). */
-  getFilingService?: () =>
-    | import("../filing/filing-service.js").FilingService
-    | undefined;
 }
 
 export interface RuntimeAttachmentMetadata {
@@ -291,6 +203,9 @@ export interface RuntimeMessagePayload {
     input: Record<string, unknown>;
     result?: string;
     isError?: boolean;
+    riskLevel?: string;
+    riskReason?: string;
+    autoApproved?: boolean;
   }>;
   interfaces?: string[];
   surfaces?: Array<{

package/src/runtime/interactive-ui-types.ts

@@ -0,0 +1,145 @@
+/**
+ * Types and constants for the interactive UI request primitive.
+ *
+ * Extracted into a standalone module so that lightweight consumers
+ * (CLI commands, route validators) can import types and constants
+ * without pulling in the daemon conversation store or surface
+ * rendering machinery that `interactive-ui.ts` depends on.
+ */
+
+// ── Reserved action IDs ──────────────────────────────────────────────
+
+/**
+ * Action IDs reserved for internal use. These are rejected by validation
+ * in both the CLI (`parseActions`) and the IPC route (`ui_request` Zod
+ * schema) so they never appear as custom button IDs.
+ *
+ * Two categories of reservation:
+ *
+ * - **Lifecycle events** (`selection_changed`, `content_changed`,
+ *   `state_update`) — intercepted by `handleSurfaceAction` in
+ *   conversation-surfaces.ts as non-terminal events (early return
+ *   without resolving the pending `ui_request`).
+ *
+ * - **Cancellation triggers** (`cancel`, `dismiss`) — resolve the
+ *   pending `ui_request` as `cancelled` instead of `submitted`.
+ */
+export const RESERVED_ACTION_IDS = new Set([
+  "selection_changed",
+  "content_changed",
+  "state_update",
+  "cancel",
+  "dismiss",
+]);
+
+// ── Cancellation reasons ─────────────────────────────────────────────
+
+/**
+ * Machine-readable reason for a `"cancelled"` outcome.
+ *
+ * - `"user_dismissed"` — the user explicitly closed/dismissed the surface
+ * - `"no_interactive_surface"` — the conversation cannot show interactive UI
+ * - `"conversation_not_found"` — the target conversation could not be located
+ * - `"resolver_unavailable"` — a resolver was registered but is not currently
+ *   available (e.g. the surface transport is disconnected)
+ * - `"resolver_error"` — the resolver threw an unexpected error
+ */
+export type CancellationReason =
+  | "user_dismissed"
+  | "no_interactive_surface"
+  | "conversation_not_found"
+  | "resolver_unavailable"
+  | "resolver_error";
+
+// ── Request / Result contracts ───────────────────────────────────────
+
+/**
+ * Describes a single action button/option presented to the user on the
+ * interactive surface.
+ */
+export interface InteractiveUiAction {
+  /** Unique identifier for this action within the request. */
+  id: string;
+  /** Human-readable label shown on the button/option. */
+  label: string;
+  /**
+   * Optional variant hint for the renderer.
+   * - `"primary"` — emphasized / default action
+   * - `"danger"` — destructive action (red styling)
+   * - `"secondary"` — de-emphasized / cancel-like action
+   */
+  variant?: "primary" | "danger" | "secondary";
+}
+
+/**
+ * A request to show an interactive UI surface to the user and await their
+ * response.
+ */
+export interface InteractiveUiRequest {
+  /** Conversation this interaction is scoped to. */
+  conversationId: string;
+  /**
+   * Surface type hint for the renderer.
+   * - `"confirmation"` — yes/no or approve/deny prompt
+   * - `"form"` — structured data entry (v1 placeholder)
+   */
+  surfaceType: "confirmation" | "form";
+  /** Optional title displayed at the top of the surface. */
+  title?: string;
+  /**
+   * Arbitrary payload describing the content of the surface. The shape
+   * depends on `surfaceType` — the runtime treats it as opaque and
+   * forwards it to the renderer.
+   */
+  data: Record<string, unknown>;
+  /** Actions (buttons) to present. When omitted, the renderer uses its default set. */
+  actions?: InteractiveUiAction[];
+  /**
+   * Maximum time (in milliseconds) to wait for a user response before
+   * the request resolves with `status: "timed_out"`. When omitted, the
+   * resolver uses its own default timeout (typically 5 minutes).
+   */
+  timeoutMs?: number;
+}
+
+/**
+ * The result of an interactive UI request after the user has responded
+ * or the request has expired.
+ */
+export interface InteractiveUiResult {
+  /**
+   * Terminal status of the interaction.
+   * - `"submitted"` — the user selected an action / submitted data
+   * - `"cancelled"` — the user explicitly dismissed the surface, or the
+   *   surface could not be shown (fail-closed)
+   * - `"timed_out"` — the timeout elapsed without a user response
+   */
+  status: "submitted" | "cancelled" | "timed_out";
+  /** The `id` of the action the user selected (when `status === "submitted"`). */
+  actionId?: string;
+  /** Structured data submitted by the user (for `surfaceType: "form"`). */
+  submittedData?: Record<string, unknown>;
+  /** Optional human-readable summary of the user's response. */
+  summary?: string;
+  /** The surface identifier that was shown, for audit/correlation. */
+  surfaceId: string;
+  /**
+   * Machine-readable reason for a `"cancelled"` outcome. Present only
+   * when `status === "cancelled"`. Allows callers to distinguish
+   * user-initiated dismissals from operational fail-closed outcomes
+   * without parsing log messages.
+   *
+   * Optional for backward compatibility — existing callers that only
+   * check `status` continue to work unchanged.
+   */
+  cancellationReason?: CancellationReason;
+  /**
+   * Short-lived informational decision token, present when
+   * `status === "submitted"` and `surfaceType === "confirmation"`.
+   *
+   * Non-authoritative — carries metadata about the decision for audit
+   * and correlation purposes only. Does not grant any capability.
+   * Verification/replay enforcement is out of scope for v1.
+   */
+  decisionToken?: string;
+}

package/src/runtime/interactive-ui.ts

@@ -11,214 +11,45 @@
  * Architecture:
  *   - Typed {@link InteractiveUiRequest} / {@link InteractiveUiResult}
  *     contracts define the wire shape for callers and resolvers.
- *   - A module-level resolver ({@link registerInteractiveUiResolver}) is
- *     installed once at daemon startup, following the same pattern as
- *     {@link registerDefaultWakeResolver} in `runtime/agent-wake.ts`.
  *   - {@link requestInteractiveUi} is the callable entry point. It
- *     delegates to the registered resolver; when no resolver is present
- *     (e.g. headless environments, test harnesses that don't install
- *     one), it fails closed by returning a `"cancelled"` result.
+ *     looks up the conversation directly from the daemon conversation
+ *     store and delegates to {@link showStandaloneSurface}.
+ *   - When the conversation is not in memory (client disconnected),
+ *     it fails closed by returning a `"cancelled"` result.
  *
  * Concurrency:
  *   - Requests are scoped to a single conversation and identified by a
  *     unique `surfaceId` generated at request time.
  *   - Multiple concurrent requests on different conversations are
  *     independent.
- *   - The resolver is responsible for lifecycle management of the
- *     underlying surface (show, await action/timeout, dismiss).
  *
  * Fail-closed guarantee:
- *   - If no resolver is registered, `requestInteractiveUi` returns
- *     `{ status: "cancelled" }` immediately.
+ *   - If the conversation is not in memory, `requestInteractiveUi`
+ *     returns `{ status: "cancelled" }` immediately.
  *   - If the request times out (per `timeoutMs`), the result status is
  *     `"timed_out"`.
  */
 
+import { findConversation } from "../daemon/conversation-store.js";
+import { showStandaloneSurface } from "../daemon/conversation-surfaces.js";
 import { getLogger } from "../util/logger.js";
 import { mintDecisionToken } from "./decision-token.js";
+import type {
+  InteractiveUiRequest,
+  InteractiveUiResult,
+} from "./interactive-ui-types.js";
+
+// Re-export types and constants so existing consumers don't break.
+export type {
+  CancellationReason,
+  InteractiveUiAction,
+  InteractiveUiRequest,
+  InteractiveUiResult,
+} from "./interactive-ui-types.js";
+export { RESERVED_ACTION_IDS } from "./interactive-ui-types.js";
 
 const log = getLogger("interactive-ui");
 
-// ── Reserved action IDs ──────────────────────────────────────────────
-
-/**
- * Action IDs reserved for internal use. These are rejected by validation
- * in both the CLI (`parseActions`) and the IPC route (`ui_request` Zod
- * schema) so they never appear as custom button IDs.
- *
- * Two categories of reservation:
- *
- * - **Lifecycle events** (`selection_changed`, `content_changed`,
- *   `state_update`) — intercepted by `handleSurfaceAction` in
- *   conversation-surfaces.ts as non-terminal events (early return
- *   without resolving the pending `ui_request`).
- *
- * - **Cancellation triggers** (`cancel`, `dismiss`) — resolve the
- *   pending `ui_request` as `cancelled` instead of `submitted`.
- */
-export const RESERVED_ACTION_IDS = new Set([
-  "selection_changed",
-  "content_changed",
-  "state_update",
-  "cancel",
-  "dismiss",
-]);
-
-// ── Cancellation reasons ─────────────────────────────────────────────
-
-/**
- * Machine-readable reason for a `"cancelled"` outcome.
- *
- * - `"user_dismissed"` — the user explicitly closed/dismissed the surface
- * - `"no_interactive_surface"` — no resolver was registered (headless / test)
- * - `"conversation_not_found"` — the target conversation could not be located
- * - `"resolver_unavailable"` — a resolver was registered but is not currently
- *   available (e.g. the surface transport is disconnected)
- * - `"resolver_error"` — the resolver threw an unexpected error
- */
-export type CancellationReason =
-  | "user_dismissed"
-  | "no_interactive_surface"
-  | "conversation_not_found"
-  | "resolver_unavailable"
-  | "resolver_error";
-
-// ── Request / Result contracts ───────────────────────────────────────
-
-/**
- * Describes a single action button/option presented to the user on the
- * interactive surface.
- */
-export interface InteractiveUiAction {
-  /** Unique identifier for this action within the request. */
-  id: string;
-  /** Human-readable label shown on the button/option. */
-  label: string;
-  /**
-   * Optional variant hint for the renderer.
-   * - `"primary"` — emphasized / default action
-   * - `"danger"` — destructive action (red styling)
-   * - `"secondary"` — de-emphasized / cancel-like action
-   */
-  variant?: "primary" | "danger" | "secondary";
-}
-
-/**
- * A request to show an interactive UI surface to the user and await their
- * response.
- */
-export interface InteractiveUiRequest {
-  /** Conversation this interaction is scoped to. */
-  conversationId: string;
-  /**
-   * Surface type hint for the renderer.
-   * - `"confirmation"` — yes/no or approve/deny prompt
-   * - `"form"` — structured data entry (v1 placeholder)
-   */
-  surfaceType: "confirmation" | "form";
-  /** Optional title displayed at the top of the surface. */
-  title?: string;
-  /**
-   * Arbitrary payload describing the content of the surface. The shape
-   * depends on `surfaceType` — the runtime treats it as opaque and
-   * forwards it to the renderer.
-   */
-  data: Record<string, unknown>;
-  /** Actions (buttons) to present. When omitted, the renderer uses its default set. */
-  actions?: InteractiveUiAction[];
-  /**
-   * Maximum time (in milliseconds) to wait for a user response before
-   * the request resolves with `status: "timed_out"`. When omitted, the
-   * resolver uses its own default timeout (typically 5 minutes).
-   */
-  timeoutMs?: number;
-}
-
-/**
- * The result of an interactive UI request after the user has responded
- * or the request has expired.
- */
-export interface InteractiveUiResult {
-  /**
-   * Terminal status of the interaction.
-   * - `"submitted"` — the user selected an action / submitted data
-   * - `"cancelled"` — the user explicitly dismissed the surface, or the
-   *   surface could not be shown (fail-closed)
-   * - `"timed_out"` — the timeout elapsed without a user response
-   */
-  status: "submitted" | "cancelled" | "timed_out";
-  /** The `id` of the action the user selected (when `status === "submitted"`). */
-  actionId?: string;
-  /** Structured data submitted by the user (for `surfaceType: "form"`). */
-  submittedData?: Record<string, unknown>;
-  /** Optional human-readable summary of the user's response. */
-  summary?: string;
-  /** The surface identifier that was shown, for audit/correlation. */
-  surfaceId: string;
-  /**
-   * Machine-readable reason for a `"cancelled"` outcome. Present only
-   * when `status === "cancelled"`. Allows callers to distinguish
-   * user-initiated dismissals from operational fail-closed outcomes
-   * without parsing log messages.
-   *
-   * Optional for backward compatibility — existing callers that only
-   * check `status` continue to work unchanged.
-   */
-  cancellationReason?: CancellationReason;
-  /**
-   * Short-lived informational decision token, present when
-   * `status === "submitted"` and `surfaceType === "confirmation"`.
-   *
-   * Non-authoritative — carries metadata about the decision for audit
-   * and correlation purposes only. Does not grant any capability.
-   * Verification/replay enforcement is out of scope for v1.
-   */
-  decisionToken?: string;
-}
-
-// ── Resolver type ────────────────────────────────────────────────────
-
-/**
- * A function that presents an interactive UI surface and resolves when
- * the user responds or the timeout elapses.
- */
-export type InteractiveUiResolver = (
-  request: InteractiveUiRequest,
-) => Promise<InteractiveUiResult>;
-
-// ── Module-level resolver registration ───────────────────────────────
-//
-// Same pattern as `runtime/agent-wake.ts`: a module-level default
-// resolver that the daemon installs once at startup. Callers that use
-// `requestInteractiveUi()` get the daemon-wired resolver automatically.
-// Tests can register a mock resolver and reset via the test-only helper.
-
-let _resolver: InteractiveUiResolver | null = null;
-
-/**
- * Install the process-wide interactive UI resolver. Called once at
- * daemon startup (see `DaemonServer.start()`) with a function that
- * knows how to show a surface on a live conversation and await the
- * user's response.
- *
- * Calling this more than once replaces the prior resolver — the daemon
- * startup path should call it exactly once.
- */
-export function registerInteractiveUiResolver(
-  resolver: InteractiveUiResolver,
-): void {
-  _resolver = resolver;
-}
-
-/**
- * Reset the process-wide resolver. Test-only.
- *
- * @internal
- */
-export function resetInteractiveUiResolverForTests(): void {
-  _resolver = null;
-}
-
 // ── Surface ID generation ────────────────────────────────────────────
 
 let _surfaceIdCounter = 0;
@@ -290,27 +121,38 @@ export async function requestInteractiveUi(
 ): Promise<InteractiveUiResult> {
   const surfaceId = generateSurfaceId();
 
-  if (!_resolver) {
+  // Look up the conversation directly. Interactive UI requires the
+  // conversation to be in memory (client connected via SSE). If not
+  // found, fail closed — hydrating from storage would be pointless
+  // since the hydrated conversation has no connected client.
+  const conversation = findConversation(request.conversationId);
+
+  if (!conversation) {
     log.warn(
       {
         conversationId: request.conversationId,
         surfaceType: request.surfaceType,
       },
-      "interactive-ui: no resolver registered; failing closed",
+      "interactive-ui: conversation not in memory (client not connected); failing closed",
     );
     const failResult: InteractiveUiResult = {
       status: "cancelled",
       surfaceId,
-      cancellationReason: "no_interactive_surface",
+      cancellationReason: "conversation_not_found",
     };
     emitAuditLog(request, failResult);
     return failResult;
   }
 
   try {
-    const resolverResult = await _resolver(request);
-    // Ensure the surfaceId is consistent — the resolver may or may not
-    // populate it, but the contract guarantees it is always present.
+    const standaloneSurfaceId = `ui-standalone-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    const resolverResult = await showStandaloneSurface(
+      conversation,
+      request,
+      standaloneSurfaceId,
+    );
+    // Ensure the surfaceId is consistent — showStandaloneSurface may or
+    // may not populate it, but the contract guarantees it is always present.
     const finalSurfaceId = resolverResult.surfaceId || surfaceId;
 
     const result: InteractiveUiResult = {

package/src/runtime/invite-redemption-service.ts

@@ -10,7 +10,7 @@
 import type { ChannelId } from "../channels/types.js";
 import { findContactChannel, getContact } from "../contacts/contact-store.js";
 import { upsertContactChannel } from "../contacts/contacts-write.js";
-import { getSqlite } from "../memory/db.js";
+import { getSqlite } from "../memory/db-connection.js";
 import {
   findActiveVoiceInvites,
   findByInviteCodeHash,

package/src/runtime/invite-redemption-templates.ts

@@ -12,7 +12,7 @@ import type { InviteRedemptionOutcome } from "./invite-redemption-service.js";
 // Template strings
 // ---------------------------------------------------------------------------
 
-export const INVITE_REPLY_TEMPLATES = {
+const INVITE_REPLY_TEMPLATES = {
   redeemed: "Welcome! You've been granted access.",
   already_member: "You already have access.",
   invalid_token: "This invite is no longer valid.",