@vellumai/assistant 0.12.2-staging.7 → 0.12.2

package/src/daemon/wake-conversation-ops.ts

@@ -22,7 +22,7 @@ import {
 import { syncMessageToDisk } from "../persistence/conversation-disk-view.js";
 import { backfillMessageIdOnLogs } from "../persistence/llm-request-log-store.js";
 import { resolveMediaSourceData } from "../providers/media-resolve.js";
-import type { Message, ToolDefinition } from "../providers/types.js";
+import type { Message } from "../providers/types.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { publishConversationMessagesChanged } from "../runtime/sync/resource-sync-events.js";
 import type { CompletedBackgroundTool } from "../tools/background-tool-registry.js";
@@ -350,60 +350,38 @@ export async function persistWakeTriggerMessage(
   }
 }
 
-/**
- * How a wake's tool allowlist is applied beyond the allowlist itself. Every
- * field is set on the conversation together with the allowlist and restored
- * with it.
- */
-export interface WakeToolScopeOptions {
-  /** How the allowlist is enforced; see {@link SubagentToolGateMode}. */
-  gateMode?: SubagentToolGateMode;
-  /**
-   * Freezes the client-context inputs for tool-definition resolution
-   * (execution-gate-mode cache-parity wakes); see {@link WakeToolContextPin}.
-   * Its `requestOrigin`, when set, is stamped onto the conversation's per-turn
-   * origin so the permission checker's origin-scoped auto-grants fire.
-   */
-  toolContextPin?: WakeToolContextPin;
-  /**
-   * Skills whose bundled tools join the turn's active set
-   * (`allowedToolNames`) so they are callable without a prior `skill_load`.
-   */
-  preactivateSkillIds?: readonly string[];
-  /**
-   * Sent verbatim as the wake's wire tool array in place of the resolved one
-   * (the source conversation's recorded surface, replayed for provider
-   * prompt-cache parity). Changes nothing about what may execute.
-   */
-  wireToolDefinitions?: readonly ToolDefinition[];
-}
-
 /**
  * Temporarily restrict the tools visible/executable during a wake by
  * reusing the conversation's subagent allowlist slot. Returns a restore
  * callback that reinstates the previous allowlist so the wake can release
  * the scope before any queued user turn is drained.
+ *
+ * `gateMode` controls how the allowlist is enforced — see
+ * {@link SubagentToolGateMode}. `toolContextPin`, when provided
+ * (execution-gate-mode cache-parity wakes), freezes the client-context
+ * inputs for tool-definition resolution — see {@link WakeToolContextPin}.
+ * Its `requestOrigin`, when set, is stamped onto the conversation's per-turn
+ * origin so the permission checker's origin-scoped auto-grants fire for the
+ * wake. `preactivateSkillIds`, when non-empty, activates those skills' bundled
+ * tools in the turn's active set (`allowedToolNames`) for the wake so they are
+ * callable without a prior `skill_load`. All are set and restored alongside the
+ * allowlist.
  */
 export function scopeWakeAllowedTools(
   conversation: Conversation,
   tools: ReadonlySet<string>,
-  {
-    gateMode = "wire",
-    toolContextPin,
-    preactivateSkillIds,
-    wireToolDefinitions,
-  }: WakeToolScopeOptions = {},
+  gateMode: SubagentToolGateMode = "wire",
+  toolContextPin?: WakeToolContextPin,
+  preactivateSkillIds?: readonly string[],
 ): () => void {
   const previous = conversation.subagentAllowedTools;
   const previousGateMode = conversation.subagentToolGateMode;
   const previousToolContextPin = conversation.toolContextPin;
   const previousRequestOrigin = conversation.currentTurnRequestOrigin;
   const previousPreactivated = conversation.preactivatedSkillIds;
-  const previousWireToolReplay = conversation.wireToolReplay;
   conversation.setSubagentAllowedTools(new Set(tools));
   conversation.subagentToolGateMode = gateMode;
   conversation.toolContextPin = toolContextPin;
-  conversation.wireToolReplay = wireToolDefinitions;
   if (toolContextPin?.requestOrigin !== undefined) {
     conversation.currentTurnRequestOrigin = toolContextPin.requestOrigin;
   }
@@ -416,6 +394,5 @@ export function scopeWakeAllowedTools(
     conversation.toolContextPin = previousToolContextPin;
     conversation.currentTurnRequestOrigin = previousRequestOrigin;
     conversation.setPreactivatedSkillIds(previousPreactivated);
-    conversation.wireToolReplay = previousWireToolReplay;
   };
 }

package/src/desktop/desktop-automation-lease.test.ts

@@ -35,9 +35,7 @@ function fixture() {
   const started = mock(async () => {});
   const released = mock(() => {});
   const releaseBrowser = mock(async () => {});
-  const notify = mock(async () => {});
   const lease = new DesktopAutomationLease({
-    notify,
     enabled: () => enabled,
     ready: () => ready,
     ensureReady,
@@ -52,7 +50,6 @@ function fixture() {
   cleanups.push(lease);
   return {
     lease,
-    notify,
     ensureReady,
     install,
     failSetup: () => setup.reject(new Error("download failed")),
@@ -131,7 +128,6 @@ test("cancellation stops running and queued browser commands without blocking a
   const callback = mock(operation);
   const queued = f.lease.runBrowser(context, callback);
   abort.abort();
-  expect(f.lease.isActive).toBe(false);
   expect(await running).toBeInstanceOf(Error);
   expect((await queued).isError).toBe(true);
   expect(callback).not.toHaveBeenCalled();
@@ -210,142 +206,3 @@ test("disabled, unidentified, cancelled and released browser calls cannot instal
   await expect(f.lease.runBrowser(context, operation)).rejects.toThrow();
   expect(f.ensureReady).not.toHaveBeenCalled();
 });
-
-test("activity follows the browser lease and clears before failed cleanup", async () => {
-  const f = fixture();
-  expect(f.lease.isActive).toBe(false);
-  await f.lease.runBrowser(context, operation);
-  expect(f.lease.isActive).toBe(true);
-  expect(f.notify).toHaveBeenCalledTimes(1);
-  await f.lease.runBrowser(context, operation);
-  expect(f.notify).toHaveBeenCalledTimes(1);
-  f.releaseBrowser.mockRejectedValueOnce(new Error("cleanup failed"));
-  await expect(f.lease.runBrowser(context, operation, true)).rejects.toThrow(
-    "cleanup failed",
-  );
-  expect(f.lease.isActive).toBe(false);
-  expect(f.notify).toHaveBeenCalledTimes(2);
-  await f.lease.runBrowser(context, operation, true);
-  expect(f.notify).toHaveBeenCalledTimes(2);
-});
-
-test("turn completion releases only its own desktop before cleanup finishes", async () => {
-  const f = fixture();
-  await f.lease.runBrowser(context, operation);
-  f.lease.releaseForConversation("conv-456");
-  expect(f.lease.isActive).toBe(true);
-  expect(f.notify).toHaveBeenCalledTimes(1);
-
-  const cleanup = Promise.withResolvers<void>();
-  f.releaseBrowser.mockImplementationOnce(() => cleanup.promise);
-  f.lease.releaseForConversation(context.conversationId);
-  expect(f.lease.isActive).toBe(false);
-  expect(f.notify).toHaveBeenCalledTimes(2);
-  await Bun.sleep(0);
-  expect(f.released).not.toHaveBeenCalled();
-
-  const callback = mock(operation);
-  const next = f.lease.runBrowser(context, callback);
-  await Bun.sleep(0);
-  expect(callback).not.toHaveBeenCalled();
-  cleanup.resolve();
-  expect((await next).isError).toBe(false);
-  expect(f.released).toHaveBeenCalledTimes(1);
-  expect(f.started).toHaveBeenCalledTimes(2);
-  expect(f.lease.isActive).toBe(true);
-});
-
-test("turn completion cancels running and queued desktop work", async () => {
-  const f = fixture();
-  const started = Promise.withResolvers<void>();
-  const running = f.lease
-    .runBrowser(context, async (signal) => {
-      started.resolve();
-      await new Promise<void>((_resolve, reject) => {
-        signal.addEventListener("abort", () => reject(new Error("aborted")), {
-          once: true,
-        });
-      });
-      return operation();
-    })
-    .catch((error: unknown) => error);
-  await started.promise;
-  const callback = mock(operation);
-  const queued = f.lease.runBrowser(context, callback);
-  f.lease.releaseForConversation(context.conversationId);
-  expect(f.lease.isActive).toBe(false);
-  expect(await running).toBeInstanceOf(Error);
-  expect((await queued).isError).toBe(true);
-  expect(callback).not.toHaveBeenCalled();
-  await f.lease.runBrowser(context, callback);
-  expect(callback).toHaveBeenCalledTimes(1);
-});
-
-test("turn handoff retries failed cleanup without another turn or restart", async () => {
-  const f = fixture();
-  await f.lease.runBrowser(context, operation);
-  f.releaseBrowser.mockRejectedValueOnce(new Error("Chrome cleanup timed out"));
-  f.lease.releaseForConversation(context.conversationId);
-  expect(f.lease.isActive).toBe(false);
-  await Bun.sleep(0);
-  expect(f.released).not.toHaveBeenCalled();
-  await Bun.sleep(1_100);
-  expect(f.released).toHaveBeenCalledTimes(1);
-  const nextContext = { ...context, conversationId: "conv-456" };
-  expect((await f.lease.runBrowser(nextContext, operation)).isError).toBe(
-    false,
-  );
-  await f.lease.runBrowser(nextContext, operation, true);
-});
-
-test("a delayed cleanup retry cannot release a replacement owner", async () => {
-  const f = fixture();
-  await f.lease.runBrowser(context, operation);
-  f.releaseBrowser.mockRejectedValueOnce(new Error("Chrome cleanup timed out"));
-  f.lease.releaseForConversation(context.conversationId);
-  await f.lease.runBrowser(context, operation, true);
-  const nextContext = { ...context, conversationId: "conv-456" };
-  await f.lease.runBrowser(nextContext, operation);
-  await Bun.sleep(1_100);
-  expect(f.lease.isActive).toBe(true);
-  expect(f.released).toHaveBeenCalledTimes(1);
-  await f.lease.runBrowser(nextContext, operation, true);
-});
-
-test("cleanup retries preserve commands queued behind an explicit handoff", async () => {
-  const f = fixture();
-  await f.lease.runBrowser(context, operation);
-  f.releaseBrowser.mockRejectedValueOnce(new Error("Chrome cleanup timed out"));
-  f.lease.releaseForConversation(context.conversationId);
-  await Bun.sleep(0);
-  const cleanup = Promise.withResolvers<void>();
-  f.releaseBrowser.mockImplementationOnce(() => cleanup.promise);
-  const detached = f.lease.runBrowser(context, operation, true);
-  await Bun.sleep(0);
-  const callback = mock(operation);
-  const next = f.lease.runBrowser(context, callback);
-  await Bun.sleep(1_100);
-  cleanup.resolve();
-  await detached;
-  expect((await next).isError).toBe(false);
-  expect(callback).toHaveBeenCalledTimes(1);
-  expect(f.lease.isActive).toBe(true);
-});
-
-test("turn completion cancels commands queued behind an in-progress detach", async () => {
-  const f = fixture();
-  await f.lease.runBrowser(context, operation);
-  const cleanup = Promise.withResolvers<void>();
-  f.releaseBrowser.mockImplementationOnce(() => cleanup.promise);
-  const detached = f.lease.runBrowser(context, operation, true);
-  await Bun.sleep(0);
-  const callback = mock(operation);
-  const queued = f.lease.runBrowser(context, callback);
-  f.lease.releaseForConversation(context.conversationId);
-  cleanup.resolve();
-  await detached;
-  expect((await queued).isError).toBe(true);
-  expect(callback).not.toHaveBeenCalled();
-  await f.lease.runBrowser(context, callback);
-  expect(callback).toHaveBeenCalledTimes(1);
-});

package/src/desktop/desktop-automation-lease.ts

@@ -1,5 +1,4 @@
 import { getConfig } from "../config/loader.js";
-import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import type { ToolContext, ToolExecutionResult } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
 import { desktopDependencyInstaller } from "./desktop-dependencies.js";
@@ -36,29 +35,14 @@ export class DesktopAutomationLease {
       ready: () => boolean;
       ensureReady: (signal: AbortSignal) => Promise<void>;
       manager: () => DesktopSessionManager;
-      notify: () => Promise<unknown>;
     } = {
       enabled: () => isVirtualDesktopEnabled(getConfig()),
       ready: () => desktopDependencyInstaller.getStatus().state === "ready",
       ensureReady: (signal) => desktopDependencyInstaller.ensureReady(signal),
       manager: getDesktopSessionManager,
-      notify: async () =>
-        broadcastMessage({ type: "desktop_activity_changed" }),
     },
   ) {}
 
-  get isActive(): boolean {
-    return this.owner !== null && !this.owner.abort.signal.aborted;
-  }
-
-  private notify(): void {
-    void this.deps
-      .notify()
-      .catch((err) =>
-        log.warn({ err }, "Desktop browser activity notification failed"),
-      );
-  }
-
   private exclusive<T>(run: () => Promise<T>): Promise<T> {
     const next = this.tail.then(run, run);
     this.tail = next.catch(() => {});
@@ -100,25 +84,9 @@ export class DesktopAutomationLease {
     }
     this.generation += 1;
     owner.abort.abort();
-    this.releaseCancelledOwner(owner);
-  }
-
-  private releaseCancelledOwner(owner: Owner): void {
-    void this.exclusive(async () => {
-      if (this.owner === owner) {
-        await this.release();
-      }
-    }).catch((err) => {
-      log.warn({ err }, "Desktop browser session cleanup failed");
-      const retry = setTimeout(() => this.releaseCancelledOwner(owner), 1_000);
-      retry.unref?.();
-    });
-  }
-
-  releaseForConversation(conversationId: string): void {
-    if (this.owner?.conversationId === conversationId) {
-      this.cancel(this.owner);
-    }
+    void this.exclusive(() => this.release()).catch((err) =>
+      log.warn({ err }, "Desktop browser session cleanup failed"),
+    );
   }
 
   private bindCancellation(owner: Owner, signal?: AbortSignal): void {
@@ -154,10 +122,6 @@ export class DesktopAutomationLease {
       throw new Error("The desktop is busy or shutting down");
     }
     this.owner = owner;
-    owner.abort.signal.addEventListener("abort", () => this.notify(), {
-      once: true,
-    });
-    this.notify();
     this.bindCancellation(owner, context.signal);
     const cancel = () => this.cancel(owner);
     this.watchdog = setInterval(() => {

package/src/messaging/provider-message-metadata.ts

@@ -30,9 +30,9 @@ import { CHANNEL_IDS } from "../channels/types.js";
  * The schema passes through what it does not name, so a provider carries its
  * own fields (Slack's file markers and timezone labels) on this same object
  * and validates them with its own schema. This is how `SourceMetadataSchema`
- * carries `botMentioned` and the email fields on the wire: one object per
- * row, no per-provider sub-envelope, and no second copy of anything named
- * here.
+ * already carries `slackBotMentioned` and the email fields on the wire: one
+ * object per row, no per-provider sub-envelope, and no second copy of
+ * anything named here.
  */
 
 const providerReactionMetadataSchema = z.object({

package/src/notifications/__tests__/copy-composer.test.ts

@@ -503,76 +503,6 @@ describe("composeFallbackCopy plugin schedule templates", () => {
   });
 });
 
-// ── activity.complete rendering ───────────────────────────────────────
-
-describe("activity.complete copy", () => {
-  function completeSignal(
-    contextPayload: Record<string, unknown>,
-  ): NotificationSignal {
-    return makeSignal({
-      sourceEventName: "activity.complete",
-      contextPayload,
-    });
-  }
-
-  test("a producer-authored title survives the fallback path", () => {
-    // The home feed reads the payload title first; the popup must say the
-    // same thing when the classifier was unreachable.
-    const copy = composeFallbackCopy(
-      completeSignal({
-        title: "Skill updated: Weekly Report Export",
-        summary: "Added the retry after an expired session.",
-      }),
-      CHANNELS,
-    );
-    expect(copy.vellum?.title).toBe("Skill updated: Weekly Report Export");
-    expect(copy.vellum?.body).toBe("Added the retry after an expired session.");
-  });
-
-  test("the pass-through's requestedTitle is honored when no title is set", () => {
-    const copy = composeFallbackCopy(
-      completeSignal({
-        requestedTitle: "Nightly export finished",
-        summary: "Wrote 12 files to the reports folder.",
-      }),
-      CHANNELS,
-    );
-    expect(copy.vellum?.title).toBe("Nightly export finished");
-  });
-
-  test("without an authored title the headline is the summary's first sentence", () => {
-    const copy = composeFallbackCopy(
-      completeSignal({
-        summary:
-          "Added the retry after an expired session. Dropped the login step.",
-      }),
-      CHANNELS,
-    );
-    expect(copy.vellum?.title).toBe(
-      "Added the retry after an expired session.",
-    );
-  });
-
-  test("an authored title the normalizer rejects falls back to the derived one", () => {
-    const copy = composeFallbackCopy(
-      completeSignal({
-        title: "Skill\nupdated",
-        summary: "Added the retry after an expired session.",
-      }),
-      CHANNELS,
-    );
-    expect(copy.vellum?.title).toBe(
-      "Added the retry after an expired session.",
-    );
-  });
-
-  test("neither a title nor a summary still says something happened", () => {
-    const copy = composeFallbackCopy(completeSignal({}), CHANNELS);
-    expect(copy.vellum?.title).toBe("Activity complete");
-    expect(copy.vellum?.body).toBe("An activity has completed");
-  });
-});
-
 // ── deriveTitle ───────────────────────────────────────────────────────
 
 describe("deriveTitle", () => {

package/src/notifications/copy-composer.ts

@@ -346,22 +346,14 @@ const TEMPLATES: Partial<Record<NotificationSourceEventName, CopyTemplate>> = {
 
   // Titled by what was done rather than by the kind of event: the summary's
   // first sentence is the outcome ("Finished the fuel-system diagnostic app"),
-  // which is what a reader scanning the bell wants to see. A producer that
-  // names its subject in the payload keeps that name here, read in the same
-  // order the home feed reads it, so the headline is the same whether or not
-  // the classifier ran. A summary with neither still gets a title that says
-  // something happened.
+  // which is what a reader scanning the bell wants to see. A summary without
+  // one still gets a title that says something happened.
   "activity.complete": (payload) => {
     const summary = nonEmpty(
       typeof payload.summary === "string" ? payload.summary : undefined,
     );
-    const authored = normalizeTitle(
-      readPayloadString(payload, "title") ??
-        readPayloadString(payload, "requestedTitle") ??
-        "",
-    );
     return {
-      title: authored || (summary ? deriveTitle(summary) : "Activity complete"),
+      title: summary ? deriveTitle(summary) : "Activity complete",
       body: summary ?? "An activity has completed",
     };
   },

package/src/oauth/seed-providers.ts

@@ -1398,11 +1398,20 @@ export const PROVIDER_SEED_DATA: Record<
       "read_customers",
       "write_customers",
       "read_inventory",
+      "write_inventory",
       "read_locations",
       "read_fulfillments",
+      "write_fulfillments",
       "read_discounts",
       "write_discounts",
       "read_price_rules",
+      "write_price_rules",
+      "read_content",
+      "write_content",
+      "read_reports",
+      // Location, shipping, and marketing writes stay opt-in from the scope
+      // picker: they change store setup rather than day-to-day operations,
+      // and keeping them out of the defaults keeps the install consent short.
       // write_themes covers listing, duplicating, and publishing themes.
       // Writing theme files (settings, JSON templates, Liquid) also requires
       // Shopify's theme-code exemption on the app itself, which is granted
@@ -1449,6 +1458,7 @@ export const PROVIDER_SEED_DATA: Record<
         description: "Adjust inventory levels and items",
       },
       { scope: "read_locations", description: "Read store locations" },
+      { scope: "write_locations", description: "Add and edit store locations" },
       { scope: "read_fulfillments", description: "Read fulfillment services" },
       {
         scope: "write_fulfillments",
@@ -1468,6 +1478,14 @@ export const PROVIDER_SEED_DATA: Record<
       },
       { scope: "read_files", description: "Read files uploaded to the store" },
       { scope: "write_files", description: "Upload and update files" },
+      {
+        scope: "read_content",
+        description: "Read blog posts, pages, and comments",
+      },
+      {
+        scope: "write_content",
+        description: "Create and update blog posts, pages, and comments",
+      },
       { scope: "read_gift_cards", description: "Read gift cards" },
       {
         scope: "write_gift_cards",
@@ -1481,11 +1499,23 @@ export const PROVIDER_SEED_DATA: Record<
         scope: "read_shipping",
         description: "Read shipping and delivery carrier services",
       },
+      {
+        scope: "write_shipping",
+        description: "Create and update delivery carrier services",
+      },
+      {
+        scope: "read_reports",
+        description: "Run ShopifyQL sales and analytics queries",
+      },
       { scope: "read_analytics", description: "Read analytics and reports" },
       {
         scope: "read_marketing_events",
         description: "Read marketing events and activities",
       },
+      {
+        scope: "write_marketing_events",
+        description: "Create and update marketing events and activities",
+      },
       { scope: "read_order_edits", description: "Read order edits" },
       {
         scope: "write_order_edits",

package/src/persistence/conversation-plugin-facade.ts

@@ -1,4 +1,3 @@
-import type { ToolDefinition } from "../providers/types.js";
 import type {
   AddMessageOptions,
   ConversationRow,
@@ -53,18 +52,6 @@ export async function getMessages(
   return fn(conversationId);
 }
 
-/**
- * The tool definitions the conversation's most recent live turn sent to the
- * provider, or `null` when none has been recorded.
- */
-export async function getConversationToolSurface(
-  conversationId: string,
-): Promise<ToolDefinition[] | null> {
-  const { getConversationToolSurface: fn } =
-    await import("./conversation-tool-surface.js");
-  return fn(conversationId);
-}
-
 /** Whether the conversation currently has a turn in flight. */
 export async function isConversationProcessing(id: string): Promise<boolean> {
   const { isConversationProcessing: fn } =

package/src/persistence/schema/index.ts

@@ -5,7 +5,6 @@ export * from "./calls.js";
 export * from "./contacts.js";
 export * from "./conversation-groups.js";
 export * from "./conversation-starters.js";
-export * from "./conversation-tool-surfaces.js";
 export * from "./conversations.js";
 export * from "./documents.js";
 export * from "./guardian.js";

package/src/persistence/steps.ts

@@ -485,7 +485,6 @@ import { migrateChannelInboundMessageIdIndex } from "./migrations/374-channel-in
 import { migrateCreateChannelOutboundPosts } from "./migrations/375-create-channel-outbound-posts.js";
 import { migrateNotificationDeliveriesCanonicalMessageId } from "./migrations/376-notification-deliveries-canonical-message-id.js";
 import { migrateAddSubagentBudgetStopReason } from "./migrations/377-add-subagent-budget-stop-reason.js";
-import { migrateCreateConversationToolSurfaces } from "./migrations/378-create-conversation-tool-surfaces.js";
 import type { MigrationStep } from "./migrations/run-migrations.js";
 
 export const migrationSteps: MigrationStep[] = [
@@ -1612,5 +1611,4 @@ export const migrationSteps: MigrationStep[] = [
     // this as a no-op.
     dependsOn: ["migrateCreateSubagentsTable"],
   },
-  migrateCreateConversationToolSurfaces,
 ];

package/src/plugin-api/conversation-turn.ts

@@ -284,20 +284,13 @@ export async function runConversationTurn(
   const { resolveChannelCapabilities } =
     await import("../daemon/conversation-runtime-assembly.js");
 
-  // Channel-addressed turns are inbound: the gateway classifies the sender
-  // and the turn runs only if that actor clears the channel admission floor.
-  // Internal plugin jobs (no channel address) use guardian trust because they
-  // are assistant-owned work, not an external sender.
+  // Plugin-driven turns run as the guardian: plugins are installed by the
+  // guardian, so their conversations inherit guardian trust. This lets the
+  // existing non-interactive auto-approve machinery handle tool permissions
+  // (the conversation is already non-interactive via `isInteractive: false`
+  // below) without requiring a client to approve prompts.
   const { INTERNAL_GUARDIAN_TRUST_CONTEXT } =
     await import("../daemon/trust-context.js");
-  const { resolvePluginChannelTurnTrust } =
-    await import("./plugin-channel-turn-trust.js");
-  const { prepareChannelInboundContent } =
-    await import("../runtime/routes/inbound-stages/inbound-content-prep.js");
-
-  const trustContext = options.channel
-    ? await resolvePluginChannelTurnTrust(options.channel)
-    : INTERNAL_GUARDIAN_TRUST_CONTEXT;
 
   // A channel address resolves through the same binding an inbound message
   // uses, so a turn addressed by chat lands in that chat's conversation
@@ -318,7 +311,7 @@ export async function runConversationTurn(
     ? !channelConversation.created
     : getConversation(conversationId) != null;
   const conversation = await getOrCreateConversation(conversationId, {
-    trustContext,
+    trustContext: INTERNAL_GUARDIAN_TRUST_CONTEXT,
     ...(options.conversationType
       ? { conversationType: options.conversationType }
       : {}),
@@ -343,23 +336,10 @@ export async function runConversationTurn(
 
   // Convert ContentBlock[] input to the text + attachments shape the
   // conversation's processMessage path expects.
-  const { text: rawText, attachments } = extractContentAndAttachments(
+  const { text, attachments } = extractContentAndAttachments(
     options.content,
     resolveMediaSourceData,
   );
-  const inboundContent = options.channel
-    ? prepareChannelInboundContent({
-        trimmedContent: rawText,
-        trustClass: trustContext.trustClass,
-        sourceChannel: options.channel.sourceChannel,
-        requesterIdentifier:
-          options.channel.username ??
-          options.channel.externalUserId ??
-          undefined,
-      })
-    : { content: rawText, displayContent: undefined };
-  const text = inboundContent.content;
-  const displayContent = inboundContent.displayContent;
 
   // The channel this turn speaks on. Runtime assembly reads the per-turn
   // context first and falls back to the conversation's `originChannel`, then
@@ -429,8 +409,6 @@ export async function runConversationTurn(
       requestId,
       isInteractive: false,
       metadata,
-      trustContext,
-      ...(displayContent ? { displayContent } : {}),
     });
     if (enqueueResult.rejected) {
       throw new Error(
@@ -454,8 +432,6 @@ export async function runConversationTurn(
     onEvent,
     isInteractive: false,
     metadata,
-    trustContext,
-    ...(displayContent ? { displayContent } : {}),
     ...(options.callSite ? { callSite: options.callSite } : {}),
   });