@vellumai/assistant 0.8.2 → 0.8.4

package/src/daemon/lifecycle.ts

@@ -32,6 +32,7 @@ import {
 } from "../credential-execution/startup-timeout.js";
 import { FilingService } from "../filing/filing-service.js";
 import { HeartbeatService } from "../heartbeat/heartbeat-service.js";
+import { startHomeContentRefresh } from "../home/home-content-refresh.js";
 import { backfillRelationshipStateIfMissing } from "../home/relationship-state-writer.js";
 import { closeSentry, initSentry, setSentryDeviceId } from "../instrument.js";
 import { getMcpServerManager } from "../mcp/manager.js";
@@ -49,6 +50,7 @@ import { startMemoryJobsWorker } from "../memory/jobs-worker.js";
 import { initQdrantClient, resolveQdrantUrl } from "../memory/qdrant-client.js";
 import { QdrantManager } from "../memory/qdrant-manager.js";
 import { rotateToolInvocations } from "../memory/tool-usage-store.js";
+import { sweepConceptPageFrontmatter } from "../memory/v2/frontmatter-sweep.js";
 import {
   emitNotificationSignal,
   registerBroadcastFn,
@@ -96,10 +98,6 @@ import {
 import { WorkspaceHeartbeatService } from "../workspace/heartbeat-service.js";
 import { WORKSPACE_MIGRATIONS } from "../workspace/migrations/registry.js";
 import { runWorkspaceMigrations } from "../workspace/migrations/runner.js";
-import {
-  createApprovalConversationGenerator,
-  createApprovalCopyGenerator,
-} from "./approval-generators.js";
 import {
   cleanupPidFile,
   cleanupPidFileIfOwner,
@@ -111,10 +109,6 @@ import {
   stopDiskPressureGuard,
 } from "./disk-pressure-guard.js";
 import { bootstrapPlugins } from "./external-plugins-bootstrap.js";
-import {
-  createGuardianActionCopyGenerator,
-  createGuardianFollowUpConversationGenerator,
-} from "./guardian-action-generators.js";
 import { backfillSlackInjectionTemplates } from "./handlers/config-slack-channel.js";
 import { installAssistantSymlink } from "./install-symlink.js";
 import {
@@ -128,7 +122,6 @@ import {
   registerMessagingProviders,
   registerWatcherProviders,
 } from "./providers-setup.js";
-import { seedInterfaceFiles } from "./seed-files.js";
 import { DaemonServer } from "./server.js";
 import { installShutdownHandlers } from "./shutdown-handlers.js";
 import { refreshSkillCapabilityMemories } from "./skill-memory-refresh.js";
@@ -276,8 +269,13 @@ async function startCesProcess(
 
 // Entry point for the daemon process itself
 export async function runDaemon(): Promise<void> {
+  const startupStartedAt = Date.now();
+  // dotenv loads before the first log call so the lazy root logger
+  // initializes against the final VELLUM_WORKSPACE_DIR / log path, not
+  // whatever was in the live environment at process spawn.
   loadDotEnv();
   validateEnv();
+  log.info({ version: APP_VERSION }, "Daemon starting");
 
   try {
     // Initialize crash reporting eagerly so early startup failures are
@@ -322,6 +320,35 @@ export async function runDaemon(): Promise<void> {
     const signingKey = resolveSigningKey();
     initAuthSigningKey(signingKey);
 
+    // Start the runtime HTTP server early so /healthz answers ASAP.
+    let runtimeHttp: RuntimeHttpServer | null = null;
+    const httpPort = getRuntimeHttpPort();
+    const httpHostname = getRuntimeHttpHost();
+    log.info({ httpPort }, "Daemon startup: starting runtime HTTP server");
+
+    runtimeHttp = new RuntimeHttpServer({
+      port: httpPort,
+      hostname: httpHostname,
+    });
+
+    // Isolated try/catch around start() — a bind failure (port in use,
+    // permission denied, fd exhaustion) must not tear down the rest of
+    // daemon startup. The daemon falls back to IPC-only operation when
+    // runtimeHttp is null.
+    try {
+      await runtimeHttp.start();
+      log.info(
+        { port: httpPort, hostname: httpHostname },
+        "Daemon startup: runtime HTTP server listening",
+      );
+    } catch (err) {
+      log.warn(
+        { err, port: httpPort },
+        "Failed to start runtime HTTP server, continuing without it",
+      );
+      runtimeHttp = null;
+    }
+
     // Pre-populate feature flag overrides so subsequent sync
     // isAssistantFeatureFlagEnabled() calls have data. Fired non-blocking
     // so a slow or unreachable gateway doesn't delay daemon startup (the
@@ -331,8 +358,6 @@ export async function runDaemon(): Promise<void> {
       log.warn({ err }, "Background feature flag init failed"),
     );
 
-    seedInterfaceFiles();
-
     log.info("Daemon startup: initializing DB");
     ensurePromptFiles();
 
@@ -448,6 +473,10 @@ export async function runDaemon(): Promise<void> {
         );
       });
 
+      // Pre-warm LLM-generated home page content (greeting + suggestion
+      // prompts) so the GET handler never triggers LLM calls.
+      startHomeContentRefresh();
+
       // Backfill injection templates on Slack bot token credentials so the
       // credential proxy can inject Authorization headers. Safe on every startup.
       try {
@@ -861,34 +890,16 @@ export async function runDaemon(): Promise<void> {
           })();
         }
 
-        // Build the BM25 corpus stats (per-token document frequencies and
-        // average document length) used by the v2 sparse channel, then
-        // re-seed v2 skill entries so any skill vectors written during the
-        // cold-start window with the legacy TF encoder get rewritten with
-        // stemmed BM25 vectors. Fire-and-forget for the same reason as PKB
-        // reconcile — the stats and skill reseed are optional optimizations,
-        // never boot-blocking dependencies.
         void rebuildBm25CorpusStatsAndReseedSkills(config);
 
-        // Validate every concept page's frontmatter against the strict
-        // schema and emit a `warn` per offender. Surfaces schema drift
-        // (unknown keys, type mismatches) at boot time instead of waiting
-        // for the failure to manifest as a silent V2 retrieval no-op when
-        // a bad page first lands in a conversation's top-K. Fire-and-forget
-        // and the sweep itself never throws — defense in depth via the
-        // outer try/catch.
-        void (async () => {
-          try {
-            const { sweepConceptPageFrontmatter } =
-              await import("../memory/v2/frontmatter-sweep.js");
-            await sweepConceptPageFrontmatter(getWorkspaceDir());
-          } catch (err) {
-            log.warn(
-              { err },
-              "Concept page frontmatter sweep threw — continuing startup",
-            );
-          }
-        })();
+        try {
+          await sweepConceptPageFrontmatter(config, getWorkspaceDir());
+        } catch (err) {
+          log.warn(
+            { err },
+            "Concept page frontmatter sweep threw — continuing startup",
+          );
+        }
       }
 
       log.info("Daemon startup: starting memory worker");
@@ -1009,24 +1020,12 @@ export async function runDaemon(): Promise<void> {
       },
     );
 
-    // Start the runtime HTTP server for optional REST API access.
-    // Defaults to port 7821.
-    let runtimeHttp: RuntimeHttpServer | null = null;
-    const httpPort = getRuntimeHttpPort();
-    log.info({ httpPort }, "Daemon startup: starting runtime HTTP server");
-
-    const hostname = getRuntimeHttpHost();
-
-    runtimeHttp = new RuntimeHttpServer({
-      port: httpPort,
-      hostname,
-      approvalCopyGenerator: createApprovalCopyGenerator(),
-      approvalConversationGenerator: createApprovalConversationGenerator(),
-      guardianActionCopyGenerator: createGuardianActionCopyGenerator(),
-      guardianFollowUpConversationGenerator:
-        createGuardianFollowUpConversationGenerator(),
-    });
-
+    // Wire up the runtime HTTP server's deferred dependencies. The server
+    // itself was bound early in runDaemon (right after the auth signing key
+    // was loaded) so /healthz and /readyz already answer 200 OK; these
+    // registrations attach the live DaemonServer / CES / relay handlers to
+    // the running routes. They're module-level state, so they're effective
+    // even when the HTTP server failed to bind (IPC clients still work).
     registerSecretsDeps({
       getCesClient: () => server.getCesClient(),
       onProviderCredentialsChanged: () =>
@@ -1043,8 +1042,9 @@ export async function runDaemon(): Promise<void> {
       log.warn({ err }, "Background Qdrant init failed"),
     );
 
-    // Inject voice bridge deps BEFORE attempting to start the HTTP server.
-    // The bridge must be available even when the HTTP server fails to bind.
+    // Inject voice bridge deps so route handlers + the relay pipeline can
+    // resolve a conversation by ID once a call lands. Module-level state,
+    // so available even when the HTTP server failed to bind.
     setVoiceBridgeDeps({
       getOrCreateConversation: (conversationId, _transport) =>
         server.getConversationForMessages(conversationId),
@@ -1063,7 +1063,6 @@ export async function runDaemon(): Promise<void> {
       },
     });
     try {
-      await runtimeHttp.start();
       setRelayBroadcast((msg) => broadcastMessage(msg));
       setPointerMessageProcessor(
         async (conversationId, instruction, requiredFacts) => {
@@ -1201,14 +1200,10 @@ export async function runDaemon(): Promise<void> {
         },
       );
       server.broadcastStatus();
-      log.info(
-        { port: httpPort, hostname },
-        "Daemon startup: runtime HTTP server listening",
-      );
     } catch (err) {
       log.warn(
-        { err, port: httpPort },
-        "Failed to start runtime HTTP server, continuing without it",
+        { err },
+        "Failed to wire runtime HTTP server deps, continuing without them",
       );
       runtimeHttp = null;
     }
@@ -1240,7 +1235,6 @@ export async function runDaemon(): Promise<void> {
     }
 
     writePid(process.pid);
-    log.info({ pid: process.pid }, "Daemon started");
 
     // Install the `assistant` CLI symlink idempotently on every daemon start.
     // Non-blocking — failures are logged but don't affect startup.
@@ -1357,6 +1351,14 @@ export async function runDaemon(): Promise<void> {
         cleanupPidFile();
       },
     });
+
+    log.info(
+      {
+        durationMs: Date.now() - startupStartedAt,
+        pid: process.pid,
+      },
+      "Daemon started",
+    );
   } catch (err) {
     log.error({ err }, "Daemon startup failed — cleaning up");
     stopDiskPressureGuardForLifecycle();

package/src/daemon/memory-v2-startup.ts

@@ -35,6 +35,19 @@ export function maybeSeedMemoryV2Skills(config: AssistantConfig): void {
     );
 }
 
+/**
+ * Fire-and-forget seed of the v2 CLI-subcommand entries (indexed alongside
+ * concept pages and skills in `memory_v2_concept_pages` under the
+ * `cli-commands/<name>` slug prefix). Dynamic import keeps v2 code out of the
+ * startup graph when the gate is off. Never awaits — startup must not block.
+ */
+export function maybeSeedMemoryV2CliCommands(config: AssistantConfig): void {
+  if (!config.memory.v2.enabled) return;
+  void import("../memory/v2/cli-command-store.js")
+    .then(({ seedV2CliCommandEntries }) => seedV2CliCommandEntries())
+    .catch((err) => log.warn({ err }, "Failed to seed v2 CLI-command entries"));
+}
+
 /**
  * Build the v2 BM25 corpus stats (per-token document frequencies + avg doc
  * length), then re-seed the v2 skill entries so any skills written during
@@ -56,6 +69,8 @@ export function maybeSeedMemoryV2Skills(config: AssistantConfig): void {
 export async function rebuildBm25CorpusStatsAndReseedSkills(
   config: AssistantConfig,
 ): Promise<void> {
+  if (!config.memory.v2.enabled) return;
+
   try {
     const { rebuildConceptPageCorpusStats } =
       await import("../memory/v2/sparse-bm25.js");
@@ -69,19 +84,40 @@ export async function rebuildBm25CorpusStatsAndReseedSkills(
     return;
   }
 
-  if (!config.memory.v2.enabled) return;
-  try {
-    const { seedV2SkillEntries } = await import("../memory/v2/skill-store.js");
-    await seedV2SkillEntries({ throwOnError: true });
-    log.info(
-      "Memory v2 skill embeddings re-seeded with BM25 vectors after corpus-stats build",
-    );
-  } catch (err) {
-    log.warn(
-      { err },
-      "Failed to re-seed v2 skill entries after BM25 corpus-stats build — skills seeded during cold start may keep TF-only sparse vectors until next reseed",
-    );
-  }
+  // Skills and CLI commands share the unified collection but are independent
+  // catalogs — reseed in parallel so the second one isn't gated on the first.
+  await Promise.all([
+    (async () => {
+      try {
+        const { seedV2SkillEntries } =
+          await import("../memory/v2/skill-store.js");
+        await seedV2SkillEntries({ throwOnError: true });
+        log.info(
+          "Memory v2 skill embeddings re-seeded with BM25 vectors after corpus-stats build",
+        );
+      } catch (err) {
+        log.warn(
+          { err },
+          "Failed to re-seed v2 skill entries after BM25 corpus-stats build — skills seeded during cold start may keep TF-only sparse vectors until next reseed",
+        );
+      }
+    })(),
+    (async () => {
+      try {
+        const { seedV2CliCommandEntries } =
+          await import("../memory/v2/cli-command-store.js");
+        await seedV2CliCommandEntries({ throwOnError: true });
+        log.info(
+          "Memory v2 CLI-command embeddings re-seeded with BM25 vectors after corpus-stats build",
+        );
+      } catch (err) {
+        log.warn(
+          { err },
+          "Failed to re-seed v2 CLI-command entries after BM25 corpus-stats build — entries seeded during cold start may keep TF-only sparse vectors until next reseed",
+        );
+      }
+    })(),
+  ]);
 }
 
 /**

package/src/daemon/message-protocol.ts

@@ -22,6 +22,7 @@ export * from "./message-types/contacts.js";
 export * from "./message-types/conversations.js";
 export * from "./message-types/diagnostics.js";
 export * from "./message-types/disk-pressure.js";
+export * from "./message-types/document-comments.js";
 export * from "./message-types/documents.js";
 export * from "./message-types/guardian-actions.js";
 export * from "./message-types/home.js";
@@ -45,6 +46,7 @@ export * from "./message-types/subagents.js";
 export * from "./message-types/surfaces.js";
 export * from "./message-types/sync.js";
 export * from "./message-types/upgrades.js";
+export * from "./message-types/web-activity.js";
 export * from "./message-types/work-items.js";
 export * from "./message-types/workspace.js";
 
@@ -76,6 +78,7 @@ import type {
   _DiagnosticsServerMessages,
 } from "./message-types/diagnostics.js";
 import type { _DiskPressureServerMessages } from "./message-types/disk-pressure.js";
+import type { _DocumentCommentsServerMessages } from "./message-types/document-comments.js";
 import type {
   _DocumentsClientMessages,
   _DocumentsServerMessages,
@@ -192,6 +195,7 @@ export type ServerMessage =
   | _BrowserServerMessages
   | _SubagentsServerMessages
   | _DocumentsServerMessages
+  | _DocumentCommentsServerMessages
   | _GuardianActionsServerMessages
   | _SyncInvalidationServerMessages
   | _HomeServerMessages

package/src/daemon/message-types/conversations.ts

@@ -224,6 +224,7 @@ export interface ConversationTitleUpdated {
 interface ChannelBinding {
   sourceChannel: ChannelId;
   externalChatId: string;
+  externalChatName?: string | null;
   externalThreadId?: string | null;
   externalUserId?: string | null;
   displayName?: string | null;
@@ -236,6 +237,13 @@ interface ChannelBinding {
       webUrl?: string;
     };
   };
+  slackChannel?: {
+    channelId: string;
+    name?: string;
+    link?: {
+      webUrl?: string;
+    };
+  };
 }
 
 /** Attention state metadata for a conversation's latest assistant message. */

package/src/daemon/message-types/document-comments.ts

@@ -0,0 +1,50 @@
+// Document comment event types (Server → Client).
+
+export interface DocumentCommentCreated {
+  type: "document_comment_created";
+  conversationId: string;
+  surfaceId: string;
+  comment: {
+    id: string;
+    surfaceId: string;
+    author: string;
+    content: string;
+    anchorStart?: number;
+    anchorEnd?: number;
+    anchorText?: string;
+    parentCommentId?: string;
+    status: string;
+    createdAt: number;
+    updatedAt: number;
+  };
+}
+
+export interface DocumentCommentResolved {
+  type: "document_comment_resolved";
+  conversationId: string;
+  surfaceId: string;
+  commentId: string;
+  resolvedBy: string;
+}
+
+export interface DocumentCommentReopened {
+  type: "document_comment_reopened";
+  conversationId: string;
+  surfaceId: string;
+  commentId: string;
+}
+
+export interface DocumentCommentDeleted {
+  type: "document_comment_deleted";
+  conversationId: string;
+  surfaceId: string;
+  commentId: string;
+}
+
+// --- Domain-level union alias (consumed by the barrel file) ---
+
+export type _DocumentCommentsServerMessages =
+  | DocumentCommentCreated
+  | DocumentCommentResolved
+  | DocumentCommentReopened
+  | DocumentCommentDeleted;

package/src/daemon/message-types/messages.ts

@@ -2,6 +2,7 @@
 
 import type { ChannelId, InterfaceId } from "../../channels/types.js";
 import type { CommandIntent, UserMessageAttachment } from "./shared.js";
+import type { ToolActivityMetadata } from "./web-activity.js";
 
 // === Client → Server ===
 
@@ -175,6 +176,9 @@ export interface ToolResult {
   approvalReason?: string;
   /** Snapshot of the auto-approve threshold at execution time. */
   riskThreshold?: string;
+  /** Structured activity metadata for rich client rendering. Optional; old
+   *  clients that key off `result` continue to work unchanged. */
+  activityMetadata?: ToolActivityMetadata;
 }
 
 export interface ConfirmationRequest {
@@ -363,6 +367,12 @@ export interface MessageQueuedDeleted {
   requestId: string;
 }
 
+export interface MessageSteered {
+  type: "message_steered";
+  conversationId: string;
+  requestId: string;
+}
+
 export interface SuggestionResponse {
   type: "suggestion_response";
   requestId: string;
@@ -390,6 +400,45 @@ export interface ConfirmationStateChanged {
   toolUseId?: string;
 }
 
+/**
+ * Lifecycle states reported by `interaction_resolved`.
+ *
+ *  - `"approved"` / `"rejected"` — user-supplied verdict on a confirmation.
+ *  - `"answered"` — user/client provided a response (secret value, question
+ *    answer, host-proxy result).
+ *  - `"cancelled"` — the interaction was torn down without a user response
+ *    (timeout, abort, dispose, prompter shutdown).
+ *  - `"superseded"` — invalidated by a newer event (auto-deny on enqueue, a
+ *    fresh user message arriving while a confirmation was outstanding).
+ */
+export type InteractionResolutionState =
+  | "approved"
+  | "rejected"
+  | "answered"
+  | "cancelled"
+  | "superseded";
+
+/**
+ * Broadcast when a pending interaction (confirmation, secret, question,
+ * host-proxy request) transitions to a resolved state. Clients use this to
+ * drop attention/processing indicators without polling.
+ */
+export interface InteractionResolved {
+  type: "interaction_resolved";
+  requestId: string;
+  /**
+   * Conversation key for the interaction. The daemon's internal conversation
+   * id and the web client's conversation key coincide today (see
+   * `conversation-key-store.ts`); the field is named after the client-facing
+   * concept.
+   */
+  conversationKey: string;
+  state: InteractionResolutionState;
+  /** Kind of the resolved interaction (e.g. "confirmation", "secret", "host_bash"). */
+  kind: string;
+  conversationId?: string;
+}
+
 /**
  * Server-side assistant activity lifecycle for thinking indicator placement.
  *
@@ -426,6 +475,21 @@ export interface AssistantActivityState {
   statusText?: string;
 }
 
+/**
+ * Emitted when the query complexity auto-router selects a non-default
+ * profile for the current turn. Clients use this to show an inline
+ * notification (e.g. "Using Quality for this response"). Only fires when
+ * the router picks a profile — not when the user explicitly pinned one.
+ */
+export interface TurnProfileAutoRouted {
+  type: "turn_profile_auto_routed";
+  conversationId: string;
+  /** Profile key (e.g. "quality-optimized"). */
+  profile: string;
+  /** Human-readable label (e.g. "Quality"). */
+  profileLabel: string;
+}
+
 /**
  * Broadcast to clients when a conversation's inference-profile override
  * changes. `profile` is the profile name (a key in `llm.profiles`) or
@@ -497,8 +561,11 @@ export type _MessagesServerMessages =
   | MessageDequeued
   | MessageRequestComplete
   | MessageQueuedDeleted
+  | MessageSteered
   | SuggestionResponse
   | TraceEvent
   | ConfirmationStateChanged
   | AssistantActivityState
-  | ConversationInferenceProfileUpdated;
+  | TurnProfileAutoRouted
+  | ConversationInferenceProfileUpdated
+  | InteractionResolved;

package/src/daemon/message-types/notifications.ts

@@ -14,6 +14,20 @@ export interface NotificationIntent {
    * Clients not bound to this guardian should ignore the notification.
    */
   targetGuardianPrincipalId?: string;
+  /**
+   * When true, the client must NOT post this intent to the OS notification
+   * surface (`UNUserNotificationCenter` on macOS). Non-banner side effects
+   * (guardian filtering, fallback dedup, mark-unseen + history catch-up on
+   * the paired conversation) still run. The home-feed inbox entry is
+   * written independently by `home-feed-side-effect.ts` and is unaffected
+   * by this flag.
+   *
+   * Set by the server based on `attentionHints.urgency`: true for
+   * `low`/`medium`, false for `high`/`critical`. The notification center
+   * is the always-on canonical inbox; the OS banner is reserved for
+   * signals the user opted into push for (urgency >= high).
+   */
+  silent?: boolean;
 }
 
 /** Server push — broadcast when a notification creates a new vellum conversation. */
@@ -39,6 +53,13 @@ export interface NotificationConversationCreated {
    * conversation is attributed correctly.
    */
   source?: string;
+  /**
+   * Mirrors `NotificationIntent.silent`. When true the client must not
+   * post a fallback OS banner for this conversation — the sidebar entry
+   * still appears, but the always-on inbox is the only surfaced channel.
+   * Derived from the originating signal's `attentionHints.urgency`.
+   */
+  silent?: boolean;
 }
 
 /** Client ack sent after UNUserNotificationCenter.add() completes (or fails). */

package/src/daemon/message-types/surfaces.ts

@@ -10,13 +10,15 @@ export type SurfaceType =
   | "confirmation"
   | "dynamic_page"
   | "file_upload"
-  | "document_preview";
+  | "document_preview"
+  | "task_preferences";
 
 export const INTERACTIVE_SURFACE_TYPES: SurfaceType[] = [
   "form",
   "confirmation",
   "dynamic_page",
   "file_upload",
+  "task_preferences",
 ];
 
 export interface SurfaceAction {

package/src/daemon/message-types/web-activity.ts

@@ -0,0 +1,57 @@
+// Shared structured result types for web-search and web-fetch tool activity.
+//
+// These types describe live (SSE-time) metadata that producers (search/fetch
+// tool executors) emit and consumers (clients) render alongside the existing
+// `result: string` payload. Persistence to conversation history is out of
+// scope for this plan; the metadata is live-only.
+
+export type WebSearchProviderId =
+  | "anthropic-native"
+  | "brave"
+  | "perplexity"
+  | "tavily";
+
+export interface WebSearchResultItem {
+  rank: number; // 1-indexed
+  title: string;
+  url: string;
+  domain: string; // lowercased host
+  faviconUrl?: string;
+  snippet?: string; // not populated for anthropic-native (content encrypted)
+  age?: string; // Brave-only freshness hint
+  score?: number; // Tavily-only
+}
+
+export interface WebSearchMetadata {
+  query: string;
+  provider: WebSearchProviderId;
+  resultCount: number;
+  durationMs: number;
+  results: WebSearchResultItem[];
+  /** Present when search itself failed; results[] will be empty. */
+  errorMessage?: string;
+}
+
+export interface WebFetchMetadata {
+  url: string;
+  finalUrl: string;
+  status: number;
+  contentType?: string;
+  byteCount: number;
+  charCount: number;
+  truncated: boolean;
+  title?: string;
+  domain: string;
+  faviconUrl?: string;
+  redirectCount: number;
+  durationMs: number;
+  errorMessage?: string;
+  /** Set when extracted text is dramatically smaller than raw HTML — likely a JS-rendered SPA whose meaningful content the static fetcher missed. */
+  mayRequireJavaScript?: boolean;
+}
+
+/** Discriminated container so future tools can add their own metadata. */
+export interface ToolActivityMetadata {
+  webSearch?: WebSearchMetadata;
+  webFetch?: WebFetchMetadata;
+}