@vellumai/assistant 0.7.0 → 0.7.2

package/src/runtime/routes/conversation-routes.ts

@@ -18,11 +18,8 @@ import {
   createUserMessage,
 } from "../../agent/message-types.js";
 import {
-  canServiceRegistryBrowser,
-  canServiceSseBrowser,
   CHANNEL_IDS,
   INTERFACE_IDS,
-  type InterfaceId,
   isInteractiveInterface,
   parseChannelId,
   parseInterfaceId,
@@ -38,8 +35,8 @@ import {
   isModelSlashCommand,
 } from "../../daemon/conversation-process.js";
 import {
+  buildSlashContextForContent,
   resolveSlash,
-  type SlashContext,
 } from "../../daemon/conversation-slash.js";
 import { getOrCreateConversation as getOrCreateConversationInstance } from "../../daemon/conversation-store.js";
 import {
@@ -47,23 +44,19 @@ import {
   isWakeUpGreeting,
 } from "../../daemon/first-greeting.js";
 import { renderHistoryContent } from "../../daemon/handlers/shared.js";
-import { HostBashProxy } from "../../daemon/host-bash-proxy.js";
-import { HostBrowserProxy } from "../../daemon/host-browser-proxy.js";
+import { HostAppControlProxy } from "../../daemon/host-app-control-proxy.js";
 import { HostCuProxy } from "../../daemon/host-cu-proxy.js";
-import { HostFileProxy } from "../../daemon/host-file-proxy.js";
-import { HostTransferProxy } from "../../daemon/host-transfer-proxy.js";
+import { preactivateHostProxySkills } from "../../daemon/host-proxy-preactivation.js";
 import type { ServerMessage } from "../../daemon/message-protocol.js";
 import type {
   HostProxyTransportMetadata,
   NonHostProxyTransportMetadata,
 } from "../../daemon/message-types/conversations.js";
 import { HeartbeatService } from "../../heartbeat/heartbeat-service.js";
-import { emitFeedEvent } from "../../home/emit-feed-event.js";
 import {
   writeOnboardingSidecar,
   writeRelationshipState,
 } from "../../home/relationship-state-writer.js";
-import { rewriteCommandPreview } from "../../home/rewrite-command-preview.js";
 import { ipcCall } from "../../ipc/gateway-client.js";
 import {
   getAttachmentById,
@@ -72,8 +65,6 @@ import {
   getSourcePathsForAttachments,
 } from "../../memory/attachments-store.js";
 import {
-  createCanonicalGuardianRequest,
-  generateCanonicalRequestCode,
   listCanonicalGuardianRequests,
   listPendingRequestsByConversationScope,
   resolveCanonicalGuardianRequest,
@@ -98,8 +89,6 @@ import { searchConversations } from "../../memory/conversation-queries.js";
 import { getConfiguredProvider } from "../../providers/provider-send-message.js";
 import type { Provider } from "../../providers/types.js";
 import { checkIngressForSecrets } from "../../security/secret-ingress.js";
-import { redactSecrets } from "../../security/secret-scanner.js";
-import { summarizeToolInput } from "../../tools/tool-input-summary.js";
 import { getLogger } from "../../util/logger.js";
 import {
   getInterfacesDir,
@@ -107,11 +96,8 @@ import {
 } from "../../util/platform.js";
 import { silentlyWithLog } from "../../util/silently.js";
 import { buildAssistantEvent } from "../assistant-event.js";
-import { assistantEventHub } from "../assistant-event-hub.js";
+import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
-import { getChromeExtensionRegistry } from "../chrome-extension-registry.js";
-import { getClientRegistry } from "../client-registry.js";
-import { bridgeConfirmationRequestToGuardian } from "../confirmation-request-guardian-bridge.js";
 import { routeGuardianReply } from "../guardian-reply-router.js";
 import { healGuardianBindingDrift } from "../guardian-vellum-migration.js";
 import type {
@@ -357,18 +343,6 @@ async function tryConsumeCanonicalGuardianReply(params: {
   return { consumed: true, messageId };
 }
 
-function resolveCanonicalRequestSourceType(
-  sourceChannel: string | undefined,
-): "desktop" | "channel" | "voice" {
-  if (sourceChannel === "phone") {
-    return "voice";
-  }
-  if (sourceChannel === "vellum") {
-    return "desktop";
-  }
-  return "channel";
-}
-
 function getInterfaceFilesWithMtimes(
   interfacesDir: string | null,
 ): Array<{ path: string; mtimeMs: number }> {
@@ -1022,348 +996,6 @@ function mergeConsecutiveAssistantMessages(messages: MessageRow[]): {
   return { messages: result, mergedIdMap };
 }
 
-/**
- * Build an `onEvent` callback that publishes every outbound event to the
- * assistant event hub, maintaining ordered delivery through a serial chain.
- *
- * Also registers pending interactions when confirmation_request,
- * secret_request, host_bash_request, host_browser_request, host_file_request,
- * or host_cu_request events flow through, so standalone approval/result
- * endpoints can look up the conversation by requestId.
- */
-function makeHubPublisher(
-  deps: SendMessageDeps,
-  conversationId: string,
-  conversation: Conversation,
-): (msg: ServerMessage) => void {
-  let hubChain: Promise<void> = Promise.resolve();
-  return (msg: ServerMessage) => {
-    // Register pending interactions for approval events
-    if (msg.type === "confirmation_request") {
-      pendingInteractions.register(msg.requestId, {
-        conversation,
-        conversationId,
-        kind: "confirmation",
-        confirmationDetails: {
-          toolName: msg.toolName,
-          input: msg.input,
-          riskLevel: msg.riskLevel,
-          executionTarget: msg.executionTarget,
-          allowlistOptions: msg.allowlistOptions,
-          scopeOptions: msg.scopeOptions,
-          persistentDecisionsAllowed: msg.persistentDecisionsAllowed,
-        },
-      });
-
-      const inputRecord = msg.input as Record<string, unknown>;
-      const commandPreview =
-        redactSecrets(summarizeToolInput(msg.toolName, inputRecord)) ||
-        undefined;
-      const technicalTitle = commandPreview
-        ? `Requesting permission: ${commandPreview}`
-        : `Requesting approval to use ${msg.toolName}.`;
-      const dedupKey = `tool-approval:${msg.requestId}`;
-
-      // Emit immediately with the technical preview.
-      void emitFeedEvent({
-        source: "assistant",
-        title: technicalTitle,
-        summary: technicalTitle,
-        dedupKey,
-        urgency: msg.riskLevel === "high" ? "high" : "medium",
-        conversationId,
-        detailPanel: { kind: "toolPermission" },
-      }).catch((err) => {
-        log.warn(
-          { err, requestId: msg.requestId },
-          "Failed to emit tool approval request feed event",
-        );
-      });
-
-      // Background: rewrite into prose and update the feed item.
-      if (commandPreview) {
-        void rewriteCommandPreview(msg.toolName, commandPreview)
-          .then((prose) => {
-            if (prose) {
-              const proseTitle = `Requesting permission: ${prose}`;
-              return emitFeedEvent({
-                source: "assistant",
-                title: proseTitle,
-                summary: proseTitle,
-                dedupKey,
-                urgency: msg.riskLevel === "high" ? "high" : "medium",
-                conversationId,
-                detailPanel: { kind: "toolPermission" },
-              });
-            }
-          })
-          .catch((err) => {
-            log.warn(
-              { err, requestId: msg.requestId },
-              "Failed to update feed event with prose rewrite",
-            );
-          });
-      }
-
-      // Create a canonical guardian request so HTTP handlers can find it
-      // via applyCanonicalGuardianDecision.
-      try {
-        const trustContext = conversation.trustContext;
-        const sourceChannel = trustContext?.sourceChannel ?? "vellum";
-        const inputRecord = msg.input as Record<string, unknown>;
-        const activityRaw =
-          (typeof inputRecord.activity === "string"
-            ? inputRecord.activity
-            : undefined) ??
-          (typeof inputRecord.reason === "string"
-            ? inputRecord.reason
-            : undefined);
-        const canonicalRequest = createCanonicalGuardianRequest({
-          id: msg.requestId,
-          kind: "tool_approval",
-          sourceType: resolveCanonicalRequestSourceType(sourceChannel),
-          sourceChannel,
-          conversationId,
-          requesterExternalUserId: trustContext?.requesterExternalUserId,
-          requesterChatId: trustContext?.requesterChatId,
-          guardianExternalUserId: trustContext?.guardianExternalUserId,
-          guardianPrincipalId: trustContext?.guardianPrincipalId ?? undefined,
-          toolName: msg.toolName,
-          commandPreview:
-            redactSecrets(summarizeToolInput(msg.toolName, inputRecord)) ||
-            undefined,
-          riskLevel: msg.riskLevel,
-          activityText: activityRaw ? redactSecrets(activityRaw) : undefined,
-          executionTarget: msg.executionTarget,
-          status: "pending",
-          requestCode: generateCanonicalRequestCode(),
-          expiresAt: Date.now() + 5 * 60 * 1000,
-        });
-
-        // For trusted-contact conversations, bridge to guardian.question so the
-        // guardian gets notified and can approve via callback/request-code.
-        if (trustContext) {
-          bridgeConfirmationRequestToGuardian({
-            canonicalRequest,
-            trustContext,
-            conversationId,
-            toolName: msg.toolName,
-            assistantId:
-              conversation.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID,
-          });
-        }
-      } catch (err) {
-        log.debug(
-          { err, requestId: msg.requestId, conversationId },
-          "Failed to create canonical request from hub publisher",
-        );
-      }
-    } else if (msg.type === "secret_request") {
-      pendingInteractions.register(msg.requestId, {
-        conversation,
-        conversationId,
-        kind: "secret",
-      });
-    } else {
-      registerHostProxyPendingInteraction(msg, conversation, conversationId);
-    }
-
-    // ServerMessage is a large union; conversationId exists on most but not all variants.
-    const msgConversationId =
-      "conversationId" in msg &&
-      typeof (msg as { conversationId?: unknown }).conversationId === "string"
-        ? (msg as { conversationId: string }).conversationId
-        : undefined;
-    // `conversation_list_invalidated` is a list-level system event: it
-    // describes no particular conversation and every connected client
-    // should refresh its sidebar. Publish it unscoped so the SSE hub does
-    // not filter it out by the subscriber's `filter.conversationId`.
-    // Other events (including `conversation_title_updated`) stay scoped to
-    // their conversation — unscoped scoped-events would leak foreign
-    // `conversationId` values to native clients' speculative ID-resolution
-    // path. For `conversation_title_updated` we instead enqueue a matching
-    // unscoped `conversation_list_invalidated` below so other clients'
-    // sidebars can refresh and pick up the new title.
-    const resolvedConversationId =
-      msg.type === "conversation_list_invalidated"
-        ? undefined
-        : (msgConversationId ?? conversationId);
-    const event = buildAssistantEvent(
-      DAEMON_INTERNAL_ASSISTANT_ID,
-      msg,
-      resolvedConversationId,
-    );
-    hubChain = (async () => {
-      await hubChain;
-      try {
-        await deps.assistantEventHub.publish(event);
-      } catch (err) {
-        log.warn(
-          { err },
-          "assistant-events hub subscriber threw during POST /messages",
-        );
-      }
-
-      // When the agent loop auto-generates a conversation title, also
-      // broadcast an unscoped `conversation_list_invalidated` so every
-      // connected client's sidebar can refresh and pick up the new title.
-      // Without this, clients viewing other conversations (or a draft)
-      // would never learn that the title for this conversation changed.
-      // The scoped `conversation_title_updated` above still handles the
-      // in-place update for the client currently viewing this conversation.
-      if (msg.type === "conversation_title_updated") {
-        try {
-          await deps.assistantEventHub.publish(
-            buildAssistantEvent(DAEMON_INTERNAL_ASSISTANT_ID, {
-              type: "conversation_list_invalidated",
-              reason: "renamed",
-            }),
-          );
-        } catch (err) {
-          log.warn(
-            { err },
-            "Failed to publish conversation_list_invalidated after title update",
-          );
-        }
-      }
-    })();
-  };
-}
-
-/**
- * Register pending interactions for host proxy request envelopes so
- * standalone result endpoints can resolve by requestId.
- *
- * Returns the registered requestId when a host proxy request was registered.
- * Callers that route through non-hub transports (e.g. registry-routed
- * host_browser sends) can use this to clean up the registration if send fails.
- */
-function registerHostProxyPendingInteraction(
-  msg: ServerMessage,
-  conversation: Conversation,
-  conversationId: string,
-): string | undefined {
-  if (msg.type === "host_bash_request") {
-    pendingInteractions.register(msg.requestId, {
-      conversation,
-      conversationId,
-      kind: "host_bash",
-    });
-    return msg.requestId;
-  }
-  if (msg.type === "host_browser_request") {
-    pendingInteractions.register(msg.requestId, {
-      conversation,
-      conversationId,
-      kind: "host_browser",
-    });
-    return msg.requestId;
-  }
-  if (msg.type === "host_file_request") {
-    pendingInteractions.register(msg.requestId, {
-      conversation,
-      conversationId,
-      kind: "host_file",
-    });
-    return msg.requestId;
-  }
-  if (msg.type === "host_cu_request") {
-    pendingInteractions.register(msg.requestId, {
-      conversation,
-      conversationId,
-      kind: "host_cu",
-    });
-    return msg.requestId;
-  }
-  if (msg.type === "host_transfer_request") {
-    pendingInteractions.register(msg.requestId, {
-      conversation,
-      conversationId,
-      kind: "host_transfer",
-    });
-    return msg.requestId;
-  }
-  return undefined;
-}
-
-/**
- * Resolve the host_browser sender function for a conversation turn.
- *
- * Transport selection:
- *   1. **WebSocket registry** — when the guardian has an active entry in
- *      ChromeExtensionRegistry (self-hosted direct WS connection), the
- *      registry-routed sender is returned. Frames go directly over the
- *      WebSocket to the extension.
- *   2. **SSE event hub** — when no WebSocket connection exists but a
- *      chrome-extension client is connected via SSE (cloud/platform mode),
- *      the SSE hub sender (`onEvent`) is returned. The extension receives
- *      `host_browser_request` frames as SSE events and POSTs results back
- *      to `/v1/host-browser-result`.
- *
- * When neither transport is available, `onEvent` is returned as the
- * default sender (used by macOS for its native host_browser path).
- * `hasSseExtension` is `false` in that case so the caller can avoid
- * provisioning a stale `HostBrowserProxy` for interfaces that don't
- * natively support host_browser.
- */
-function resolveHostBrowserSender(
-  conversation: Conversation,
-  conversationId: string,
-  actorPrincipalId: string | undefined,
-  onEvent: (msg: ServerMessage) => void,
-  sourceInterface: InterfaceId,
-): {
-  sender: (msg: ServerMessage) => void;
-  isRegistryRouted: boolean;
-  hasSseExtension: boolean;
-} {
-  const guardianId =
-    conversation.trustContext?.guardianPrincipalId ?? actorPrincipalId;
-  const hasExtensionConnection =
-    !!guardianId && !!getChromeExtensionRegistry().get(guardianId);
-
-  // Priority 1: WebSocket registry — direct WS to the extension.
-  if (hasExtensionConnection) {
-    const registrySender = (msg: ServerMessage): void => {
-      const requestId = registerHostProxyPendingInteraction(
-        msg,
-        conversation,
-        conversationId,
-      );
-      const gid =
-        conversation.trustContext?.guardianPrincipalId ?? actorPrincipalId;
-      if (!gid) {
-        if (requestId) pendingInteractions.resolve(requestId);
-        throw new Error(
-          "host_browser send skipped: no guardianId on AuthContext",
-        );
-      }
-      const ok = getChromeExtensionRegistry().send(gid, msg);
-      if (!ok) {
-        if (requestId) pendingInteractions.resolve(requestId);
-        throw new Error(
-          `host_browser send failed: no active connection for guardian ${gid}`,
-        );
-      }
-    };
-    return {
-      sender: registrySender,
-      isRegistryRouted: true,
-      hasSseExtension: false,
-    };
-  }
-
-  // Priority 2: SSE-connected chrome extension (cloud/platform mode).
-  // Check the ClientRegistry for a chrome-extension client specifically —
-  // getMostRecentByCapability("host_browser") would also match macOS
-  // clients, which handle browser frames through their own native path.
-  const hasSseExtension =
-    canServiceSseBrowser(sourceInterface) &&
-    !!getClientRegistry().getMostRecentByInterface("chrome-extension");
-
-  return { sender: onEvent, isRegistryRouted: false, hasSseExtension };
-}
-
 /**
  * Persist the pre-chat onboarding payload to disk.
  *
@@ -1647,7 +1279,7 @@ export async function handleSendMessage(
     if (!hasMessages(mapping.conversationId)) {
       smDeps.assistantEventHub
         .publish(
-          buildAssistantEvent(DAEMON_INTERNAL_ASSISTANT_ID, {
+          buildAssistantEvent({
             type: "conversation_list_invalidated",
             reason: "created",
           }),
@@ -1690,10 +1322,9 @@ export async function handleSendMessage(
 
   // Store pre-chat onboarding context on the conversation when this is the
   // very first message (no prior messages loaded). Artifact persistence
-  // (IDENTITY.md, USER.md, sidecar) is deferred: on the canned greeting
-  // path it runs inside the setTimeout right before warmPromptCache() so
-  // the warmed system prompt includes the identity; on the normal LLM
-  // path it runs immediately before inference starts.
+  // (IDENTITY.md, USER.md, sidecar) runs before either the canned greeting
+  // broadcast or normal LLM inference so client-side identity reads observe
+  // the selected assistant name.
   const isFirstOnboarding =
     !!body.onboarding && conversation.messages.length === 0;
   if (isFirstOnboarding) {
@@ -1757,125 +1388,39 @@ export async function handleSendMessage(
     conversation.setTrustContext({ trustClass: "guardian", sourceChannel });
   }
 
-  const onEvent = makeHubPublisher(
-    smDeps,
-    mapping.conversationId,
-    conversation,
-  );
   const isInteractive = isInteractiveInterface(sourceInterface);
-  // Only create each host proxy for interfaces that support the matching
-  // capability. macOS supports all four; the chrome-extension interface only
-  // supports host_browser. Non-desktop conversations (CLI, channels, headless)
-  // fall back to local execution.
-  // Set the proxy BEFORE updateClient so updateClient's call to
-  // hostBashProxy.updateSender targets the correct (new) proxy.
-  if (supportsHostProxy(sourceInterface, "host_bash")) {
-    // Reuse the existing proxy if the conversation is actively processing a
-    // host bash request to avoid orphaning in-flight requests.
-    if (!conversation.isProcessing() || !conversation.hostBashProxy) {
-      const proxy = new HostBashProxy(onEvent, (requestId) => {
-        pendingInteractions.resolve(requestId);
-      });
-      conversation.setHostBashProxy(proxy);
+  // Bash/File/Transfer singletons are globally available via isAvailable() —
+  // no per-conversation gating needed. CU is per-conversation (owns step
+  // count, AX tree history, loop detection).
+  if (supportsHostProxy(sourceInterface, "host_cu")) {
+    if (!conversation.isProcessing() || !conversation.hostCuProxy) {
+      conversation.setHostCuProxy(new HostCuProxy());
     }
   } else if (!conversation.isProcessing()) {
-    conversation.setHostBashProxy(undefined);
-  }
-  // Resolve the host_browser sender — registry-routed when the guardian has
-  // an active WS extension connection, SSE hub when a chrome-extension is
-  // connected via SSE (cloud mode), or SSE hub as default for macOS.
-  const {
-    sender: browserProxySendToClient,
-    isRegistryRouted,
-    hasSseExtension,
-  } = resolveHostBrowserSender(
-    conversation,
-    mapping.conversationId,
-    actorPrincipalId,
-    onEvent,
-    sourceInterface,
-  );
-
-  // Stash the registry-routed sender on the conversation so queue-drain
-  // restores (which run outside of conversation-routes.ts and only have
-  // access to `sendToClient`) can preserve it when calling
-  // `restoreBrowserProxyAvailability()`. The override is set when the
-  // sender is registry-routed (regardless of interface) and cleared when
-  // the SSE hub sender is used, so the drain path always restores the
-  // correct transport.
-  if (isRegistryRouted) {
-    conversation.hostBrowserSenderOverride = browserProxySendToClient;
-  } else {
-    conversation.hostBrowserSenderOverride = undefined;
+    conversation.setHostCuProxy(undefined);
   }
-
-  // Provision the host browser proxy when a viable transport exists:
-  //   - macOS: natively supports host_browser via its own SSE path
-  //   - WS registry: extension connected via direct WebSocket
-  //   - SSE extension: chrome extension connected via SSE (cloud mode)
-  //
-  // For chrome-extension, require an active transport (WS or SSE). Without
-  // one, host_browser_request frames would be emitted to the SSE hub with
-  // no consumer, causing a 30s proxy timeout instead of failing fast.
-  const shouldProvisionBrowserProxy =
-    supportsHostProxy(sourceInterface) ||
-    (canServiceRegistryBrowser(sourceInterface) && isRegistryRouted) ||
-    hasSseExtension;
-  if (shouldProvisionBrowserProxy) {
-    if (!conversation.isProcessing() || !conversation.hostBrowserProxy) {
-      const browserProxy = new HostBrowserProxy(
-        browserProxySendToClient,
-        (requestId) => {
-          pendingInteractions.resolve(requestId);
-        },
+  // App-control mirrors CU's per-conversation lifecycle: the proxy owns a
+  // singleton lock plus per-session loop tracking. Instantiation is
+  // unconditional when the client supports the capability — feature-flag
+  // gating lives in the skill-projection layer (which reads the
+  // `feature-flag: app-control` declaration in SKILL.md frontmatter), so
+  // an attached proxy is harmless when the flag resolves to off.
+  if (supportsHostProxy(sourceInterface, "host_app_control")) {
+    if (!conversation.isProcessing() || !conversation.hostAppControlProxy) {
+      conversation.setHostAppControlProxy(
+        new HostAppControlProxy(mapping.conversationId),
       );
-      conversation.setHostBrowserProxy(browserProxy);
     }
   } else if (!conversation.isProcessing()) {
-    conversation.setHostBrowserProxy(undefined);
+    conversation.setHostAppControlProxy(undefined);
   }
-  if (supportsHostProxy(sourceInterface, "host_file")) {
-    if (!conversation.isProcessing() || !conversation.hostFileProxy) {
-      const fileProxy = new HostFileProxy(onEvent, (requestId) => {
-        pendingInteractions.resolve(requestId);
-      });
-      conversation.setHostFileProxy(fileProxy);
-    }
-    if (!conversation.isProcessing() || !conversation.getHostTransferProxy()) {
-      const transferProxy = new HostTransferProxy(onEvent, (requestId) => {
-        pendingInteractions.resolve(requestId);
-      });
-      conversation.setHostTransferProxy(transferProxy);
-    }
-  } else if (!conversation.isProcessing()) {
-    conversation.setHostFileProxy(undefined);
-    conversation.setHostTransferProxy(undefined);
-  }
-  if (supportsHostProxy(sourceInterface, "host_cu")) {
-    if (!conversation.isProcessing() || !conversation.hostCuProxy) {
-      const cuProxy = new HostCuProxy(onEvent, (requestId) => {
-        pendingInteractions.resolve(requestId);
-      });
-      conversation.setHostCuProxy(cuProxy);
-    }
-    // Only preactivate CU when the conversation is idle — if the conversation is
-    // processing, this message will be queued and preactivation is deferred
-    // to dequeue time in drainQueueImpl to avoid mutating in-flight turn state.
-    if (!conversation.isProcessing()) {
-      conversation.addPreactivatedSkillId("computer-use");
-    }
-  } else if (!conversation.isProcessing()) {
-    conversation.setHostCuProxy(undefined);
+  // Only preactivate when the conversation is idle — if it's processing,
+  // this message will be queued and preactivation is deferred to dequeue
+  // time in drainQueueImpl to avoid mutating in-flight turn state.
+  if (!conversation.isProcessing()) {
+    preactivateHostProxySkills(conversation, sourceInterface);
   }
   // Wire sendToClient to the SSE hub so all subsystems can reach the HTTP client.
-  // Called after setHostBashProxy so updateSender targets the current proxy.
-  // When proxies are preserved during an active turn (non-desktop request while
-  // processing), skip updating proxy senders to avoid degrading them. The gate
-  // matches the host_bash capability because the legacy "reject send during
-  // host bash" flow is what this is really protecting.
-  const preservingProxies =
-    conversation.isProcessing() &&
-    !supportsHostProxy(sourceInterface, "host_bash");
   // hasNoClient must remain `!isInteractive` so downstream tool gating
   // (`isToolActiveForContext` for HOST_TOOL_NAMES, `createToolExecutor`'s
   // `isInteractive: !ctx.hasNoClient`) keeps host_bash/host_file/host_cu
@@ -1883,23 +1428,7 @@ export async function handleSendMessage(
   // is non-interactive (no SSE prompter UI) but still has a connected client
   // that can service host_browser_request events; we restore that single
   // proxy explicitly below without relaxing `hasNoClient`.
-  conversation.updateClient(onEvent, !isInteractive, {
-    skipProxySenderUpdate: preservingProxies,
-  });
-  // Re-enable the browser proxy for turns that provisioned one. This covers:
-  // - macOS: always provisioned (SSE sender or registry-routed when extension
-  //   is connected)
-  // - chrome-extension: natively supports host_browser (non-interactive but
-  //   has a connected client for host_browser_request events)
-  //
-  // The helper bypasses the `hasNoClient` gate so chrome-extension turns can
-  // drive the browser via CDP without leaking host_bash/host_file tool
-  // availability. It reads `hostBrowserSenderOverride` (set above when
-  // registry-routed) and applies the correct sender — including after
-  // queue-drain restores run from conversation-process.ts.
-  if (shouldProvisionBrowserProxy) {
-    conversation.restoreBrowserProxyAvailability?.();
-  }
+  conversation.updateClient(broadcastMessage, !isInteractive);
 
   // ── Canned first-greeting fast path ──
   // On a completely fresh workspace, skip LLM inference for the macOS
@@ -1960,25 +1489,30 @@ export async function handleSendMessage(
         conversationId,
       };
 
+      if (isFirstOnboarding) {
+        persistOnboardingArtifacts(body.onboarding!);
+      }
+
       setTimeout(() => {
-        onEvent({
+        broadcastMessage({
           type: "user_message_echo",
           text: rawContent,
           conversationId,
           messageId: persisted.id,
           clientMessageId,
         });
-        onEvent({ type: "assistant_text_delta", text: cannedGreeting });
-        onEvent({ type: "message_complete", conversationId });
+        broadcastMessage({
+          type: "assistant_text_delta",
+          text: cannedGreeting,
+          conversationId,
+        });
+        broadcastMessage({ type: "message_complete", conversationId });
         conversation.processing = false;
         silentlyWithLog(
           conversation.drainQueue(),
           "canned-greeting queue drain",
         );
 
-        if (isFirstOnboarding) {
-          persistOnboardingArtifacts(body.onboarding!);
-        }
         conversation.warmPromptCache();
       }, 0);
 
@@ -2022,7 +1556,7 @@ export async function handleSendMessage(
       content: content ?? "",
       attachments,
       conversation,
-      onEvent,
+      onEvent: broadcastMessage,
       // Desktop path: disable NL classification to avoid consuming non-decision
       // messages while a tool confirmation is pending. Deterministic code-prefix
       // and callback parsing remain active. Mirrors conversation-process.ts behavior.
@@ -2055,7 +1589,7 @@ export async function handleSendMessage(
     const enqueueResult = conversation.enqueueMessage(
       content ?? "",
       attachments,
-      onEvent,
+      broadcastMessage,
       requestId,
       undefined, // activeSurfaceId
       undefined, // currentPage
@@ -2093,10 +1627,7 @@ export async function handleSendMessage(
         for (const interaction of pendingInteractions.getByConversation(
           mapping.conversationId,
         )) {
-          if (
-            interaction.conversation === conversation &&
-            interaction.kind === "confirmation"
-          ) {
+          if (interaction.kind === "confirmation") {
             conversation.emitConfirmationStateChanged({
               conversationId: mapping.conversationId,
               requestId: interaction.requestId,
@@ -2111,7 +1642,7 @@ export async function handleSendMessage(
           }
         }
         conversation.denyAllPendingConfirmations();
-        pendingInteractions.removeByConversation(conversation);
+        pendingInteractions.removeByConversation(mapping.conversationId);
       }
 
       // Expire any orphaned canonical requests that survived without a
@@ -2140,10 +1671,7 @@ export async function handleSendMessage(
     for (const interaction of pendingInteractions.getByConversation(
       mapping.conversationId,
     )) {
-      if (
-        interaction.conversation === conversation &&
-        interaction.kind === "confirmation"
-      ) {
+      if (interaction.kind === "confirmation") {
         conversation.emitConfirmationStateChanged({
           conversationId: mapping.conversationId,
           requestId: interaction.requestId,
@@ -2158,7 +1686,7 @@ export async function handleSendMessage(
       }
     }
     conversation.denyAllPendingConfirmations();
-    pendingInteractions.removeByConversation(conversation);
+    pendingInteractions.removeByConversation(mapping.conversationId);
   }
 
   // Expire any orphaned canonical requests that survived without a
@@ -2179,17 +1707,14 @@ export async function handleSendMessage(
 
   // Resolve slash commands before persisting or running the agent loop.
   const rawContent = content ?? "";
-  const config = getConfig();
-  const slashContext: SlashContext = {
+  const slashContext = buildSlashContextForContent(rawContent, {
+    conversationId: mapping.conversationId,
     messageCount: conversation.getMessages().length,
     inputTokens: conversation.usageStats.inputTokens,
     outputTokens: conversation.usageStats.outputTokens,
-    maxInputTokens: config.llm.default.contextWindow.maxInputTokens,
-    model: config.llm.default.model,
-    provider: config.llm.default.provider,
     estimatedCost: conversation.usageStats.estimatedCost,
     userMessageInterface: sourceInterface,
-  };
+  });
   const slashResult = await resolveSlash(rawContent, slashContext);
 
   if (slashResult.kind === "unknown") {
@@ -2246,7 +1771,7 @@ export async function handleSendMessage(
       // Snapshot model info now so the deferred callback cannot observe
       // a config change from a concurrent request.
       const modelInfoEvent = isModelSlashCommand(rawContent)
-        ? await buildModelInfoEvent()
+        ? await buildModelInfoEvent(mapping.conversationId)
         : null;
 
       const response = {
@@ -2266,7 +1791,7 @@ export async function handleSendMessage(
       const conversationId = mapping.conversationId;
       const message = slashResult.message;
       setTimeout(() => {
-        onEvent({
+        broadcastMessage({
           type: "user_message_echo",
           text: rawContent,
           conversationId,
@@ -2274,10 +1799,14 @@ export async function handleSendMessage(
           clientMessageId,
         });
         if (modelInfoEvent) {
-          onEvent(modelInfoEvent);
+          broadcastMessage(modelInfoEvent);
         }
-        onEvent({ type: "assistant_text_delta", text: message });
-        onEvent({
+        broadcastMessage({
+          type: "assistant_text_delta",
+          text: message,
+          conversationId,
+        });
+        broadcastMessage({
           type: "message_complete",
           conversationId: conversationId,
         });
@@ -2323,7 +1852,7 @@ export async function handleSendMessage(
     // HTTP timeout on large contexts, causing a false "Failed to send".
     (async () => {
       try {
-        onEvent({
+        broadcastMessage({
           type: "user_message_echo",
           text: rawContent,
           conversationId,
@@ -2347,11 +1876,15 @@ export async function handleSendMessage(
         );
         conversation.getMessages().push(assistantMsg);
 
-        onEvent({ type: "assistant_text_delta", text: responseText });
-        onEvent({ type: "message_complete", conversationId });
+        broadcastMessage({
+          type: "assistant_text_delta",
+          text: responseText,
+          conversationId,
+        });
+        broadcastMessage({ type: "message_complete", conversationId });
       } catch (err) {
         log.error({ err, conversationId }, "Compact command failed");
-        onEvent({
+        broadcastMessage({
           type: "conversation_error",
           conversationId,
           code: "UNKNOWN",
@@ -2389,7 +1922,7 @@ export async function handleSendMessage(
     throw err;
   }
 
-  onEvent({
+  broadcastMessage({
     type: "user_message_echo",
     text: resolvedContent,
     conversationId: mapping.conversationId,
@@ -2398,9 +1931,9 @@ export async function handleSendMessage(
     clientMessageId,
   });
 
-  // Fire-and-forget the agent loop; events flow to the hub via onEvent.
+  // Fire-and-forget the agent loop; events flow to the hub via broadcastMessage.
   conversation
-    .runAgentLoop(resolvedContent, messageId, onEvent, {
+    .runAgentLoop(resolvedContent, messageId, broadcastMessage, {
       isInteractive,
       isUserMessage: true,
     })