diff --git a/src-tauri/src/commands/moderation.rs b/src-tauri/src/commands/moderation.rs
index 8d7923b..c8fd325 100644
--- a/src-tauri/src/commands/moderation.rs
+++ b/src-tauri/src/commands/moderation.rs
@@ -1,5 +1,11 @@
 use super::super::error::Result;
-use super::super::moderation::{self, ModerationUI, ReportSubjectInput, StoredModerationPrefs};
+use super::super::moderation::{
+    self,
+    ModerationLabelerPolicyDefinition,
+    ModerationUI,
+    ReportSubjectInput,
+    StoredModerationPrefs,
+};
 use super::super::state::AppState;
 use tauri_plugin_log::log;
 
@@ -46,7 +52,10 @@ pub async fn unsubscribe_labeler(did: String, state: State<'_>) -> Result<()> {
 ///
 /// Returns a `ModerationUI` describing what the frontend should do with the content.
 #[tauri::command]
-pub async fn moderate_content(labels_json: String, state: State<'_>) -> Result<ModerationUI> {
+pub async fn moderate_content(labels_json: String, context: String, state: State<'_>) -> Result<ModerationUI> {
+    let parsed_context = moderation::parse_moderation_context(&context)?;
+    log::debug!("moderate_content requested for context={}", parsed_context.as_str());
+
     let prefs = moderation::get_prefs(&state)?;
     let accepted_dids = moderation::accepted_labeler_dids(&prefs);
 
@@ -73,6 +82,12 @@ pub async fn moderate_content(labels_json: String, state: State<'_>) -> Result<M
     moderation::evaluate_labels(&labels_json, &prefs, &defs, &accepted_dids)
 }
 
+/// Return structured policy definitions for all accepted labelers.
+#[tauri::command]
+pub async fn get_labeler_policy_definitions(state: State<'_>) -> Result<Vec<ModerationLabelerPolicyDefinition>> {
+    moderation::get_labeler_policy_definitions(&state).await
+}
+
 /// Submit a content or account report to the Bluesky moderation service.
 ///
 /// `subject` must be `{"type":"repo","did":"..."}` or `{"type":"record","uri":"...","cid":"..."}`.
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index e9d1998..b7234a0 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -178,6 +178,7 @@ pub fn run() {
             cmd::moderation::subscribe_labeler,
             cmd::moderation::unsubscribe_labeler,
             cmd::moderation::moderate_content,
+            cmd::moderation::get_labeler_policy_definitions,
             cmd::moderation::create_report,
             cmd::moderation::get_distribution_channel
         ])
diff --git a/src-tauri/src/moderation.rs b/src-tauri/src/moderation.rs
index fa48406..5f8c382 100644
--- a/src-tauri/src/moderation.rs
+++ b/src-tauri/src/moderation.rs
@@ -79,6 +79,79 @@ impl From<ModerationDecision> for ModerationUI {
     }
 }
 
+/// The moderation context requested by the frontend.
+///
+/// Context is currently validated and logged, but does not yet change moderation behavior.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ModerationContext {
+    ContentList,
+    ContentView,
+    ContentMedia,
+    Avatar,
+    ProfileList,
+    ProfileView,
+}
+
+impl ModerationContext {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::ContentList => "contentList",
+            Self::ContentView => "contentView",
+            Self::ContentMedia => "contentMedia",
+            Self::Avatar => "avatar",
+            Self::ProfileList => "profileList",
+            Self::ProfileView => "profileView",
+        }
+    }
+}
+
+pub fn parse_moderation_context(value: &str) -> Result<ModerationContext> {
+    match value.trim() {
+        "contentList" => Ok(ModerationContext::ContentList),
+        "contentView" => Ok(ModerationContext::ContentView),
+        "contentMedia" => Ok(ModerationContext::ContentMedia),
+        "avatar" => Ok(ModerationContext::Avatar),
+        "profileList" => Ok(ModerationContext::ProfileList),
+        "profileView" => Ok(ModerationContext::ProfileView),
+        _ => Err(AppError::validation(
+            "invalid moderation context; expected one of: contentList, contentView, contentMedia, avatar, profileList, profileView",
+        )),
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModerationLabelPolicyLocale {
+    pub lang: String,
+    pub name: String,
+    pub description: String,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModerationLabelPolicyDefinition {
+    pub identifier: String,
+    pub adult_only: bool,
+    pub default_setting: Option<String>,
+    pub severity: String,
+    pub blurs: String,
+    pub display_name: Option<String>,
+    pub description: Option<String>,
+    pub locales: Vec<ModerationLabelPolicyLocale>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModerationLabelerPolicyDefinition {
+    pub labeler_did: String,
+    pub labeler_handle: Option<String>,
+    pub labeler_display_name: Option<String>,
+    pub reason_types: Option<Vec<String>>,
+    pub subject_types: Option<Vec<String>>,
+    pub subject_collections: Option<Vec<String>>,
+    pub definitions: Vec<ModerationLabelPolicyDefinition>,
+}
+
 /// Input description of what to report.
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase", tag = "type")]
@@ -289,6 +362,181 @@ pub async fn fetch_labeler_policies_from_api(
         .collect()
 }
 
+/// Fetch detailed labeler views from the API for the given DIDs.
+///
+/// Returns only detailed views and skips malformed DIDs.
+pub async fn fetch_labeler_views_from_api(
+    session: &LazuriteOAuthSession, dids: &[String],
+) -> Vec<jacquard::api::app_bsky::labeler::LabelerViewDetailed<'static>> {
+    if dids.is_empty() {
+        return Vec::new();
+    }
+
+    let parsed_dids: Vec<Did<'_>> = dids
+        .iter()
+        .filter_map(|s| {
+            Did::new(s)
+                .map_err(|error| {
+                    log::warn!("skipping invalid labeler DID '{s}': {error}");
+                    error
+                })
+                .ok()
+        })
+        .collect();
+
+    if parsed_dids.is_empty() {
+        return Vec::new();
+    }
+
+    let request = GetServices::new().dids(parsed_dids).detailed(true).build();
+    let response = match session.send(request).await {
+        Ok(r) => r,
+        Err(error) => {
+            log::warn!("failed to fetch detailed labeler views: {error}");
+            return Vec::new();
+        }
+    };
+
+    let output = match response.into_output() {
+        Ok(o) => o,
+        Err(error) => {
+            log::warn!("failed to decode detailed labeler views response: {error}");
+            return Vec::new();
+        }
+    };
+
+    output
+        .views
+        .into_iter()
+        .filter_map(|view| match view {
+            GetServicesOutputViewsItem::LabelerViewDetailed(detailed) => Some((*detailed).into_static()),
+            _ => None,
+        })
+        .collect()
+}
+
+fn preferred_locale_strings(locales: &[ModerationLabelPolicyLocale]) -> (Option<String>, Option<String>) {
+    if locales.is_empty() {
+        return (None, None);
+    }
+
+    if let Some(en) = locales.iter().find(|locale| locale.lang.eq_ignore_ascii_case("en")) {
+        return (Some(en.name.clone()), Some(en.description.clone()));
+    }
+
+    if let Some(en_region) = locales
+        .iter()
+        .find(|locale| locale.lang.to_ascii_lowercase().starts_with("en-"))
+    {
+        return (Some(en_region.name.clone()), Some(en_region.description.clone()));
+    }
+
+    let fallback = &locales[0];
+    (Some(fallback.name.clone()), Some(fallback.description.clone()))
+}
+
+fn normalize_label_definition(def: &LabelValueDefinition<'_>) -> ModerationLabelPolicyDefinition {
+    let mut locales = def
+        .locales
+        .iter()
+        .map(|locale| ModerationLabelPolicyLocale {
+            lang: locale.lang.as_ref().to_string(),
+            name: locale.name.as_ref().to_string(),
+            description: locale.description.as_ref().to_string(),
+        })
+        .collect::<Vec<_>>();
+    locales.sort_by(|left, right| left.lang.cmp(&right.lang).then(left.name.cmp(&right.name)));
+
+    let (display_name, description) = preferred_locale_strings(&locales);
+
+    ModerationLabelPolicyDefinition {
+        identifier: def.identifier.as_ref().to_string(),
+        adult_only: def.adult_only.unwrap_or(false),
+        default_setting: def.default_setting.as_ref().map(|setting| setting.as_ref().to_string()),
+        severity: def.severity.as_ref().to_string(),
+        blurs: def.blurs.as_ref().to_string(),
+        display_name,
+        description,
+        locales,
+    }
+}
+
+fn normalize_label_definitions(defs: &[LabelValueDefinition<'_>]) -> Vec<ModerationLabelPolicyDefinition> {
+    let mut normalized = defs.iter().map(normalize_label_definition).collect::<Vec<_>>();
+    normalized.sort_by(|left, right| left.identifier.cmp(&right.identifier));
+    normalized.dedup_by(|left, right| left.identifier == right.identifier);
+    normalized
+}
+
+/// Return structured policy definitions for all accepted labelers (built-in + subscribed).
+pub async fn get_labeler_policy_definitions(state: &AppState) -> Result<Vec<ModerationLabelerPolicyDefinition>> {
+    let prefs = get_prefs(state)?;
+    let accepted_dids = accepted_labeler_dids(&prefs);
+    let session = get_session(state).await?;
+
+    let defs = build_labeler_defs(&session, state, &accepted_dids).await;
+    let fetched_views = fetch_labeler_views_from_api(&session, &accepted_dids).await;
+    let mut views_by_did: HashMap<String, jacquard::api::app_bsky::labeler::LabelerViewDetailed<'static>> =
+        HashMap::new();
+    for view in fetched_views {
+        views_by_did.insert(view.creator.did.as_ref().to_string(), view);
+    }
+
+    let mut policies = Vec::with_capacity(accepted_dids.len());
+
+    for did in accepted_dids {
+        let view = views_by_did.get(&did);
+        let definitions_from_view = view
+            .and_then(|value| value.policies.label_value_definitions.as_ref())
+            .map(|definitions| normalize_label_definitions(definitions))
+            .unwrap_or_default();
+
+        let definitions = if !definitions_from_view.is_empty() {
+            definitions_from_view
+        } else if let Ok(parsed) = Did::new(&did) {
+            defs.get(&parsed)
+                .map(normalize_label_definitions)
+                .unwrap_or_default()
+        } else {
+            Vec::new()
+        };
+
+        let reason_types = view.map(|value| {
+            value
+                .reason_types
+                .as_ref()
+                .map(|types| types.iter().map(|item| item.as_ref().to_string()).collect::<Vec<String>>())
+        });
+        let subject_types = view.map(|value| {
+            value
+                .subject_types
+                .as_ref()
+                .map(|types| types.iter().map(|item| item.as_ref().to_string()).collect::<Vec<String>>())
+        });
+        let subject_collections = view.map(|value| {
+            value.subject_collections.as_ref().map(|collections| {
+                collections
+                    .iter()
+                    .map(|item| item.as_ref().to_string())
+                    .collect::<Vec<String>>()
+            })
+        });
+
+        policies.push(ModerationLabelerPolicyDefinition {
+            labeler_did: did,
+            labeler_handle: view.map(|value| value.creator.handle.as_ref().to_string()),
+            labeler_display_name: view
+                .and_then(|value| value.creator.display_name.as_ref().map(|name| name.as_ref().to_string())),
+            reason_types: reason_types.flatten(),
+            subject_types: subject_types.flatten(),
+            subject_collections: subject_collections.flatten(),
+            definitions,
+        });
+    }
+
+    Ok(policies)
+}
+
 /// Build `LabelerDefs` for the given DIDs, using the local cache where available
 /// and fetching from the API for any missing/stale entries.
 ///
@@ -678,6 +926,83 @@ mod tests {
         assert!(!channel.is_empty());
     }
 
+    #[test]
+    fn moderation_context_validation() {
+        let contexts = [
+            "contentList",
+            "contentView",
+            "contentMedia",
+            "avatar",
+            "profileList",
+            "profileView",
+        ];
+
+        for context in contexts {
+            let parsed = parse_moderation_context(context).expect("context should parse");
+            assert_eq!(parsed.as_str(), context);
+        }
+
+        let invalid = parse_moderation_context("not-a-context").expect_err("invalid context should fail");
+        assert!(invalid.to_string().contains("invalid moderation context"));
+    }
+
+    #[test]
+    fn label_policy_definition_normalization_prefers_english_locale() {
+        let definition: LabelValueDefinition<'static> = serde_json::from_str(
+            r#"{
+                "identifier":"graphic-media",
+                "adultOnly":true,
+                "blurs":"media",
+                "defaultSetting":"warn",
+                "severity":"alert",
+                "locales":[
+                    {"lang":"fr","name":"Média graphique","description":"Contenu potentiellement choquant"},
+                    {"lang":"en-US","name":"Graphic media","description":"Potentially disturbing media"}
+                ]
+            }"#,
+        )
+        .expect("definition should deserialize");
+
+        let normalized = normalize_label_definition(&definition);
+        assert_eq!(normalized.identifier, "graphic-media");
+        assert!(normalized.adult_only);
+        assert_eq!(normalized.default_setting.as_deref(), Some("warn"));
+        assert_eq!(normalized.severity, "alert");
+        assert_eq!(normalized.blurs, "media");
+        assert_eq!(normalized.display_name.as_deref(), Some("Graphic media"));
+        assert_eq!(normalized.description.as_deref(), Some("Potentially disturbing media"));
+        assert_eq!(normalized.locales.len(), 2);
+    }
+
+    #[test]
+    fn label_policy_definition_normalization_deduplicates_identifiers() {
+        let definitions: Vec<LabelValueDefinition<'static>> = serde_json::from_str(
+            r#"[
+                {
+                    "identifier":"spam",
+                    "adultOnly":false,
+                    "blurs":"none",
+                    "defaultSetting":"ignore",
+                    "severity":"inform",
+                    "locales":[{"lang":"en","name":"Spam","description":"Spam content"}]
+                },
+                {
+                    "identifier":"spam",
+                    "adultOnly":false,
+                    "blurs":"content",
+                    "defaultSetting":"warn",
+                    "severity":"alert",
+                    "locales":[{"lang":"en","name":"Spam duplicate","description":"Duplicate"}]
+                }
+            ]"#,
+        )
+        .expect("definitions should deserialize");
+
+        let normalized = normalize_label_definitions(&definitions);
+        assert_eq!(normalized.len(), 1);
+        assert_eq!(normalized[0].identifier, "spam");
+    }
+
     #[test]
     fn evaluate_labels_empty_returns_no_moderation() {
         let prefs = StoredModerationPrefs::default();
diff --git a/src/components/deck/AddColumnPanel.tsx b/src/components/deck/AddColumnPanel.tsx
index b5b68fc..df7410b 100644
--- a/src/components/deck/AddColumnPanel.tsx
+++ b/src/components/deck/AddColumnPanel.tsx
@@ -1,436 +1,53 @@
-// TODO: there is a lot of prop drilling in this module, and could benefit from the splitProps pattern.
-import { ActorSuggestionList, useActorSuggestions } from "$/components/actors/actor-search";
-import { FeedController } from "$/lib/api/feeds";
 import type { ColumnKind } from "$/lib/api/types/columns";
 import type { SearchMode } from "$/lib/api/types/search";
-import { getFeedName } from "$/lib/feeds";
-import type { FeedGeneratorView, LoginSuggestion, SavedFeedItem } from "$/lib/types";
-import * as logger from "@tauri-apps/plugin-log";
-import { createEffect, createSignal, For, Match, onCleanup, onMount, Show, Switch } from "solid-js";
+import { createEffect, createSignal, For, Match, onCleanup, Show, splitProps, Switch } from "solid-js";
 import { Portal } from "solid-js/web";
 import { Motion, Presence } from "solid-motionone";
-import { FeedChipAvatar } from "../feeds/FeedChipAvatar";
-import { Icon, SearchModeIcon } from "../shared/Icon";
+import { Icon } from "../shared/Icon";
+import { DiagnosticsPicker, ExplorerPicker, FeedPicker, MessagesPicker } from "./ColumnPicker";
+import { ProfilePicker } from "./ColumnPicker/ProfileColumnPicker";
+import { SearchPicker } from "./ColumnPicker/SearchPicker";
+import type { FeedPickerSelection, ProfileSelection } from "./types";
 
 type AddColumnPanelProps = { onAdd: (kind: ColumnKind, config: string) => void; onClose: () => void; open: boolean };
 
 type PanelTab = ColumnKind;
 
-type FeedPickerSelection = { feed: SavedFeedItem; title: string };
-
-function feedKindLabel(feed: SavedFeedItem) {
-  switch (feed.type) {
-    case "timeline": {
-      return "Timeline";
-    }
-    case "list": {
-      return "List";
-    }
-    default: {
-      return "Feed";
-    }
-  }
-}
-
-function FeedPicker(props: { onSelect: (selection: FeedPickerSelection) => void }) {
-  const [feeds, setFeeds] = createSignal<SavedFeedItem[]>([]);
-  const [generators, setGenerators] = createSignal<Record<string, FeedGeneratorView>>({});
-  const [loading, setLoading] = createSignal(true);
-
-  onMount(async () => {
-    try {
-      const prefs = await FeedController.getPreferences();
-      setFeeds(prefs.savedFeeds);
-
-      const uris = [...new Set(prefs.savedFeeds.filter((feed) => feed.type === "feed").map((feed) => feed.value))];
-      if (uris.length > 0) {
-        const hydrated = await FeedController.getFeedGenerators(uris);
-        setGenerators(Object.fromEntries(hydrated.feeds.map((generator) => [generator.uri, generator])));
-      }
-    } catch (err) {
-      logger.error(`Failed to load feeds for column picker: ${String(err)}`);
-    } finally {
-      setLoading(false);
-    }
-  });
-
-  return (
-    <div class="grid gap-2">
-      <Show when={loading()}>
-        <div class="flex items-center justify-center py-6">
-          <span class="flex items-center text-on-surface-variant">
-            <i class="i-ri-loader-4-line animate-spin" />
-          </span>
-        </div>
-      </Show>
-
-      <Show when={!loading() && feeds().length === 0}>
-        <p class="py-4 text-center text-sm text-on-surface-variant">No saved feeds found.</p>
-      </Show>
-
-      <For
-        each={feeds()}
-        fallback={
-          <Show when={!loading()}>
-            <p class="py-4 text-center text-sm text-on-surface-variant">No saved feeds found.</p>
-          </Show>
-        }>
-        {(feed) => (
-          <button
-            type="button"
-            class="flex w-full items-center gap-3 rounded-xl border-0 bg-white/4 px-4 py-3 text-left transition duration-150 hover:-translate-y-px hover:bg-white/8"
-            onClick={() => props.onSelect({ feed, title: getFeedName(feed, generators()[feed.value]?.displayName) })}>
-            <FeedChipAvatar feed={feed} generator={generators()[feed.value]} />
-            <span class="min-w-0 flex-1">
-              <span class="block truncate text-sm font-medium text-on-surface">
-                {getFeedName(feed, generators()[feed.value]?.displayName)}
-              </span>
-              <span class="block truncate text-xs text-on-surface-variant">{feedKindLabel(feed)}</span>
-            </span>
-          </button>
-        )}
-      </For>
-    </div>
-  );
-}
-
-function ExplorerPicker(props: { onSubmit: (uri: string) => void }) {
-  const [value, setValue] = createSignal("");
-
-  function handleSubmit(e: Event) {
-    e.preventDefault();
-    const uri = value().trim();
-    if (uri) {
-      props.onSubmit(uri);
-    }
-  }
-
-  return (
-    <form onSubmit={handleSubmit} class="grid gap-3">
-      <label class="grid gap-1.5">
-        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">
-          Target URI / handle / DID / PDS URL
-        </span>
-        <input
-          type="text"
-          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
-          placeholder="at://did:plc:… or handle.bsky.social"
-          value={value()}
-          onInput={(e) => setValue(e.currentTarget.value)} />
-      </label>
-
-      <button
-        type="submit"
-        disabled={!value().trim()}
-        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
-        <span class="flex items-center">
-          <i class="i-ri-compass-discover-line" />
-        </span>
-        Open in column
-      </button>
-    </form>
-  );
-}
-
-function DiagnosticsPicker(props: { onSubmit: (did: string) => void }) {
-  const [value, setValue] = createSignal("");
-
-  function handleSubmit(e: Event) {
-    e.preventDefault();
-    const did = value().trim();
-    if (did) {
-      props.onSubmit(did);
-    }
-  }
-
-  return (
-    <form onSubmit={handleSubmit} class="grid gap-3">
-      <label class="grid gap-1.5">
-        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Handle or DID</span>
-        <input
-          type="text"
-          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
-          placeholder="handle.bsky.social or did:plc:…"
-          value={value()}
-          onInput={(e) => setValue(e.currentTarget.value)} />
-      </label>
-
-      <button
-        type="submit"
-        disabled={!value().trim()}
-        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
-        <span class="flex items-center">
-          <i class="i-ri-stethoscope-line" />
-        </span>
-        Open diagnostics
-      </button>
-    </form>
-  );
-}
-
-function MessagesPicker(props: { onSubmit: () => void }) {
-  return (
-    <div class="grid gap-4">
-      <div class="rounded-2xl bg-white/4 p-4 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.04)]">
-        <div class="flex items-start gap-3">
-          <span class="mt-0.5 flex items-center text-primary">
-            <i class="i-ri-message-3-line" />
-          </span>
-          <div class="grid gap-1.5">
-            <p class="m-0 text-sm font-medium text-on-surface">Direct messages</p>
-            <p class="m-0 text-xs leading-relaxed text-on-surface-variant">
-              Opens your DM inbox inside the deck. Message content is blurred until you hover or focus the column.
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <button
-        type="button"
-        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25"
-        onClick={() => props.onSubmit()}>
-        <span class="flex items-center">
-          <i class="i-ri-layout-column-line" />
-        </span>
-        Add DM column
-      </button>
-    </div>
-  );
-}
-
-function SearchModeButton(props: { active: boolean; disabled?: boolean; mode: SearchMode; onClick: () => void }) {
-  return (
-    <button
-      type="button"
-      disabled={props.disabled}
-      class="inline-flex items-center justify-center gap-2 rounded-xl border-0 px-3 py-2 text-xs font-medium transition duration-150 disabled:cursor-not-allowed disabled:opacity-40"
-      classList={{
-        "bg-primary/15 text-primary": props.active,
-        "bg-white/4 text-on-surface-variant hover:bg-white/8 hover:text-on-surface": !props.active && !props.disabled,
-      }}
-      onClick={() => props.onClick()}>
-      <SearchModeIcon mode={props.mode} class="text-sm" />
-      <span class="capitalize">{props.mode}</span>
-    </button>
-  );
-}
-
-function SearchPicker(props: { onSubmit: (query: string, mode: SearchMode) => void }) {
-  const [mode, setMode] = createSignal<SearchMode>("network");
-  const [query, setQuery] = createSignal("");
-
-  function handleSubmit(event: Event) {
-    event.preventDefault();
-    const trimmed = query().trim();
-    if (!trimmed) {
-      return;
-    }
-
-    props.onSubmit(trimmed, mode());
-  }
-
-  return (
-    <form onSubmit={handleSubmit} class="grid gap-3">
-      <label class="grid gap-1.5">
-        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Search query</span>
-        <input
-          type="text"
-          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
-          placeholder="from:alice at protocol"
-          value={query()}
-          onInput={(event) => setQuery(event.currentTarget.value)} />
-      </label>
-
-      <div class="grid gap-1.5">
-        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Search mode</span>
-        <div class="grid grid-cols-2 gap-2">
-          <SearchModeButton active={mode() === "network"} mode="network" onClick={() => setMode("network")} />
-          <SearchModeButton active={mode() === "keyword"} mode="keyword" onClick={() => setMode("keyword")} />
-          <SearchModeButton active={mode() === "semantic"} mode="semantic" onClick={() => setMode("semantic")} />
-          <SearchModeButton active={mode() === "hybrid"} mode="hybrid" onClick={() => setMode("hybrid")} />
-        </div>
-      </div>
-
-      <button
-        type="submit"
-        disabled={!query().trim()}
-        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
-        <span class="flex items-center">
-          <i class="i-ri-search-line" />
-        </span>
-        Open search column
-      </button>
-    </form>
-  );
-}
-
-function ProfilePicker(
-  props: {
-    onSubmit: (
-      selection: { actor: string; did?: string | null; displayName?: string | null; handle?: string | null },
-    ) => void;
-  },
-) {
-  let container: HTMLDivElement | undefined;
-  let input: HTMLInputElement | undefined;
-  const [value, setValue] = createSignal("");
-  const typeahead = useActorSuggestions({
-    container: () => container,
-    input: () => input,
-    onError: (error) => logger.warn(`Failed to load profile suggestions: ${String(error)}`),
-    value,
-  });
-
-  function submitManualActor() {
-    const actor = value().trim();
-    if (!actor) {
-      return;
-    }
-
-    typeahead.close();
-    props.onSubmit({ actor });
-  }
-
-  function submitSuggestion(suggestion: LoginSuggestion) {
-    typeahead.close();
-    props.onSubmit({
-      actor: suggestion.handle,
-      did: suggestion.did,
-      displayName: suggestion.displayName ?? null,
-      handle: suggestion.handle,
-    });
-  }
-
-  function handleKeyDown(event: KeyboardEvent) {
-    if (event.key === "ArrowDown") {
-      event.preventDefault();
-      typeahead.moveActiveIndex(1);
-      return;
-    }
-
-    if (event.key === "ArrowUp") {
-      event.preventDefault();
-      typeahead.moveActiveIndex(-1);
-      return;
-    }
-
-    if (event.key === "Escape") {
-      typeahead.close();
-      return;
-    }
-
-    if (event.key === "Enter" && typeahead.open() && typeahead.activeSuggestion()) {
-      event.preventDefault();
-      submitSuggestion(typeahead.activeSuggestion() as LoginSuggestion);
-    }
-  }
-
-  return (
-    <form
-      class="grid gap-3"
-      onSubmit={(event) => {
-        event.preventDefault();
-        submitManualActor();
-      }}>
-      <label class="grid gap-1.5">
-        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Handle or DID</span>
-        <div
-          class="relative"
-          ref={(element) => {
-            container = element as HTMLDivElement;
-          }}>
-          <input
-            ref={(element) => {
-              input = element;
-            }}
-            type="text"
-            role="combobox"
-            aria-autocomplete="list"
-            aria-controls="profile-suggestions"
-            aria-activedescendant={typeahead.activeIndex() >= 0
-              ? `profile-suggestions-option-${typeahead.activeIndex()}`
-              : undefined}
-            aria-expanded={typeahead.open()}
-            class="w-full rounded-xl border-0 bg-white/6 px-4 py-2.5 pr-10 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
-            placeholder="alice.bsky.social"
-            spellcheck={false}
-            value={value()}
-            onFocus={() => typeahead.focus()}
-            onInput={(event) => setValue(event.currentTarget.value)}
-            onKeyDown={(event) => handleKeyDown(event)} />
-
-          <TypeaheadLoading visible={typeahead.loading()} />
-          <ActorSuggestionList
-            activeIndex={typeahead.activeIndex()}
-            id="profile-suggestions"
-            open={typeahead.open()}
-            suggestions={typeahead.suggestions()}
-            title="Suggested profiles"
-            onSelect={submitSuggestion} />
-        </div>
-      </label>
-
-      <button
-        type="submit"
-        disabled={!value().trim()}
-        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
-        <span class="flex items-center">
-          <i class="i-ri-user-3-line" />
-        </span>
-        Open profile
-      </button>
-    </form>
-  );
-}
-
-function TypeaheadLoading(props: { visible: boolean }) {
-  return (
-    <Show when={props.visible}>
-      <span class="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-on-surface-variant">
-        <Icon kind="loader" class="animate-spin text-sm" />
-      </span>
-    </Show>
-  );
-}
-
-type PanelContentProps = {
-  tab: PanelTab;
-  onFeedSelect: (selection: FeedPickerSelection) => void;
-  onExplorerSubmit: (uri: string) => void;
+type PanelSubmissionHandlers = {
   onDiagnosticsSubmit: (did: string) => void;
+  onExplorerSubmit: (uri: string) => void;
+  onFeedSelect: (selection: FeedPickerSelection) => void;
   onMessagesSubmit: () => void;
-  onProfileSubmit: (
-    selection: { actor: string; did?: string | null; displayName?: string | null; handle?: string | null },
-  ) => void;
+  onProfileSubmit: (selection: ProfileSelection) => void;
   onSearchSubmit: (query: string, mode: SearchMode) => void;
 };
 
-function PanelContent(props: PanelContentProps) {
+function PanelContent(props: { handlers: PanelSubmissionHandlers; tab: PanelTab }) {
   return (
     <div class="min-h-0 flex-1 overflow-y-auto px-4 pb-6">
       <Switch>
         <Match when={props.tab === "feed"}>
-          <FeedPicker onSelect={props.onFeedSelect} />
+          <FeedPicker onSelect={props.handlers.onFeedSelect} />
         </Match>
 
         <Match when={props.tab === "explorer"}>
-          <ExplorerPicker onSubmit={props.onExplorerSubmit} />
+          <ExplorerPicker onSubmit={props.handlers.onExplorerSubmit} />
         </Match>
 
         <Match when={props.tab === "diagnostics"}>
-          <DiagnosticsPicker onSubmit={props.onDiagnosticsSubmit} />
+          <DiagnosticsPicker onSubmit={props.handlers.onDiagnosticsSubmit} />
         </Match>
 
         <Match when={props.tab === "messages"}>
-          <MessagesPicker onSubmit={props.onMessagesSubmit} />
+          <MessagesPicker onSubmit={props.handlers.onMessagesSubmit} />
         </Match>
 
         <Match when={props.tab === "search"}>
-          <SearchPicker onSubmit={props.onSearchSubmit} />
+          <SearchPicker onSubmit={props.handlers.onSearchSubmit} />
         </Match>
 
         <Match when={props.tab === "profile"}>
-          <ProfilePicker onSubmit={props.onProfileSubmit} />
+          <ProfilePicker onSubmit={props.handlers.onProfileSubmit} />
         </Match>
       </Switch>
     </div>
@@ -486,22 +103,18 @@ function AddColumnPanelTabs(props: AddColumnPanelTabsProps) {
   );
 }
 
-function AddColumnPanelBody(
-  props: {
-    activeTab: PanelTab;
-    onClose: () => void;
-    onDiagnosticsSubmit: (did: string) => void;
-    onExplorerSubmit: (uri: string) => void;
-    onFeedSelect: (selection: FeedPickerSelection) => void;
-    onMessagesSubmit: () => void;
-    onProfileSubmit: (
-      selection: { actor: string; did?: string | null; displayName?: string | null; handle?: string | null },
-    ) => void;
-    onSearchSubmit: (query: string, mode: SearchMode) => void;
-    onTabChange: (tab: PanelTab) => void;
-    tabs: Array<{ icon: string; id: PanelTab; label: string }>;
-  },
-) {
+type AddColumnPanelFrame = {
+  activeTab: PanelTab;
+  onClose: () => void;
+  onTabChange: (tab: PanelTab) => void;
+  tabs: Array<{ icon: string; id: PanelTab; label: string }>;
+};
+
+type AddColumnPanelBodyProps = { frame: AddColumnPanelFrame; handlers: PanelSubmissionHandlers };
+
+function AddColumnPanelBody(props: AddColumnPanelBodyProps) {
+  const [frameProps, contentProps] = splitProps(props, ["frame"], ["handlers"]);
+
   return (
     <Motion.aside
       role="dialog"
@@ -512,21 +125,18 @@ function AddColumnPanelBody(
       animate={{ opacity: 1, x: 0 }}
       exit={{ opacity: 0, x: 40 }}
       transition={{ duration: 0.22, easing: [0.32, 0.72, 0, 1] }}>
-      <AddColumnPanelHeader onClose={props.onClose} />
-      <AddColumnPanelTabs activeTab={props.activeTab} tabs={props.tabs} onTabChange={props.onTabChange} />
-      <PanelContent
-        tab={props.activeTab}
-        onFeedSelect={props.onFeedSelect}
-        onExplorerSubmit={props.onExplorerSubmit}
-        onDiagnosticsSubmit={props.onDiagnosticsSubmit}
-        onMessagesSubmit={props.onMessagesSubmit}
-        onProfileSubmit={props.onProfileSubmit}
-        onSearchSubmit={props.onSearchSubmit} />
+      <AddColumnPanelHeader onClose={frameProps.frame.onClose} />
+      <AddColumnPanelTabs
+        activeTab={frameProps.frame.activeTab}
+        tabs={frameProps.frame.tabs}
+        onTabChange={frameProps.frame.onTabChange} />
+      <PanelContent tab={frameProps.frame.activeTab} handlers={contentProps.handlers} />
     </Motion.aside>
   );
 }
 
 export function AddColumnPanel(props: AddColumnPanelProps) {
+  const [panelState, panelActions] = splitProps(props, ["open"], ["onAdd", "onClose"]);
   const [activeTab, setActiveTab] = createSignal<PanelTab>("feed");
 
   function handleFeedSelect(selection: FeedPickerSelection) {
@@ -535,31 +145,29 @@ export function AddColumnPanel(props: AddColumnPanelProps) {
       feedUri: selection.feed.value,
       title: selection.title,
     });
-    props.onAdd("feed", config);
+    panelActions.onAdd("feed", config);
   }
 
   function handleExplorerSubmit(uri: string) {
     const config = JSON.stringify({ targetUri: uri });
-    props.onAdd("explorer", config);
+    panelActions.onAdd("explorer", config);
   }
 
   function handleDiagnosticsSubmit(did: string) {
     const config = JSON.stringify({ did });
-    props.onAdd("diagnostics", config);
+    panelActions.onAdd("diagnostics", config);
   }
 
   function handleMessagesSubmit() {
-    props.onAdd("messages", JSON.stringify({}));
+    panelActions.onAdd("messages", JSON.stringify({}));
   }
 
   function handleSearchSubmit(query: string, mode: SearchMode) {
-    props.onAdd("search", JSON.stringify({ mode, query }));
+    panelActions.onAdd("search", JSON.stringify({ mode, query }));
   }
 
-  function handleProfileSubmit(
-    selection: { actor: string; did?: string | null; displayName?: string | null; handle?: string | null },
-  ) {
-    props.onAdd("profile", JSON.stringify(selection));
+  function handleProfileSubmit(selection: ProfileSelection) {
+    panelActions.onAdd("profile", JSON.stringify(selection));
   }
 
   // TODO: use IconKind for Icon
@@ -572,25 +180,25 @@ export function AddColumnPanel(props: AddColumnPanelProps) {
     { icon: "i-ri-user-3-line", id: "profile", label: "Profile" },
   ];
 
+  function handleKeyDown(event: KeyboardEvent) {
+    if (event.key === "Escape") {
+      panelActions.onClose();
+    }
+  }
+
   createEffect(() => {
-    if (!props.open) {
+    if (!panelState.open) {
       setActiveTab("feed");
       return;
     }
 
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "Escape") {
-        props.onClose();
-      }
-    };
-
     globalThis.addEventListener("keydown", handleKeyDown);
     onCleanup(() => globalThis.removeEventListener("keydown", handleKeyDown));
   });
 
   return (
     <Presence exitBeforeEnter>
-      <Show when={props.open}>
+      <Show when={panelState.open}>
         <Portal>
           <div class="fixed inset-0 z-50 flex justify-end">
             <Motion.div
@@ -599,19 +207,18 @@ export function AddColumnPanel(props: AddColumnPanelProps) {
               animate={{ opacity: 1 }}
               exit={{ opacity: 0 }}
               transition={{ duration: 0.15 }}
-              onClick={() => props.onClose()} />
+              onClick={() => panelActions.onClose()} />
 
             <AddColumnPanelBody
-              activeTab={activeTab()}
-              tabs={tabs}
-              onClose={props.onClose}
-              onTabChange={setActiveTab}
-              onFeedSelect={handleFeedSelect}
-              onExplorerSubmit={handleExplorerSubmit}
-              onDiagnosticsSubmit={handleDiagnosticsSubmit}
-              onMessagesSubmit={handleMessagesSubmit}
-              onProfileSubmit={handleProfileSubmit}
-              onSearchSubmit={handleSearchSubmit} />
+              frame={{ activeTab: activeTab(), tabs, onClose: panelActions.onClose, onTabChange: setActiveTab }}
+              handlers={{
+                onDiagnosticsSubmit: handleDiagnosticsSubmit,
+                onExplorerSubmit: handleExplorerSubmit,
+                onFeedSelect: handleFeedSelect,
+                onMessagesSubmit: handleMessagesSubmit,
+                onProfileSubmit: handleProfileSubmit,
+                onSearchSubmit: handleSearchSubmit,
+              }} />
           </div>
         </Portal>
       </Show>
diff --git a/src/components/deck/ColumnPicker.tsx b/src/components/deck/ColumnPicker.tsx
new file mode 100644
index 0000000..b505969
--- /dev/null
+++ b/src/components/deck/ColumnPicker.tsx
@@ -0,0 +1,187 @@
+import { FeedController } from "$/lib/api/feeds";
+import { getFeedName } from "$/lib/feeds";
+import type { FeedGeneratorView, SavedFeedItem } from "$/lib/types";
+import * as logger from "@tauri-apps/plugin-log";
+import { createSignal, For, onMount, Show } from "solid-js";
+import { FeedChipAvatar } from "../feeds/FeedChipAvatar";
+import type { FeedPickerSelection } from "./types";
+
+function feedKindLabel(feed: SavedFeedItem) {
+  switch (feed.type) {
+    case "timeline": {
+      return "Timeline";
+    }
+    case "list": {
+      return "List";
+    }
+    default: {
+      return "Feed";
+    }
+  }
+}
+
+export function FeedPicker(props: { onSelect: (selection: FeedPickerSelection) => void }) {
+  const [feeds, setFeeds] = createSignal<SavedFeedItem[]>([]);
+  const [generators, setGenerators] = createSignal<Record<string, FeedGeneratorView>>({});
+  const [loading, setLoading] = createSignal(true);
+
+  onMount(async () => {
+    try {
+      const prefs = await FeedController.getPreferences();
+      setFeeds(prefs.savedFeeds);
+
+      const uris = [...new Set(prefs.savedFeeds.filter((feed) => feed.type === "feed").map((feed) => feed.value))];
+      if (uris.length > 0) {
+        const hydrated = await FeedController.getFeedGenerators(uris);
+        setGenerators(Object.fromEntries(hydrated.feeds.map((generator) => [generator.uri, generator])));
+      }
+    } catch (err) {
+      logger.error(`Failed to load feeds for column picker: ${String(err)}`);
+    } finally {
+      setLoading(false);
+    }
+  });
+
+  return (
+    <div class="grid gap-2">
+      <Show when={loading()}>
+        <div class="flex items-center justify-center py-6">
+          <span class="flex items-center text-on-surface-variant">
+            <i class="i-ri-loader-4-line animate-spin" />
+          </span>
+        </div>
+      </Show>
+
+      <Show when={!loading() && feeds().length === 0}>
+        <p class="py-4 text-center text-sm text-on-surface-variant">No saved feeds found.</p>
+      </Show>
+
+      <For
+        each={feeds()}
+        fallback={
+          <Show when={!loading()}>
+            <p class="py-4 text-center text-sm text-on-surface-variant">No saved feeds found.</p>
+          </Show>
+        }>
+        {(feed) => (
+          <button
+            type="button"
+            class="flex w-full items-center gap-3 rounded-xl border-0 bg-white/4 px-4 py-3 text-left transition duration-150 hover:-translate-y-px hover:bg-white/8"
+            onClick={() => props.onSelect({ feed, title: getFeedName(feed, generators()[feed.value]?.displayName) })}>
+            <FeedChipAvatar feed={feed} generator={generators()[feed.value]} />
+            <span class="min-w-0 flex-1">
+              <span class="block truncate text-sm font-medium text-on-surface">
+                {getFeedName(feed, generators()[feed.value]?.displayName)}
+              </span>
+              <span class="block truncate text-xs text-on-surface-variant">{feedKindLabel(feed)}</span>
+            </span>
+          </button>
+        )}
+      </For>
+    </div>
+  );
+}
+
+export function ExplorerPicker(props: { onSubmit: (uri: string) => void }) {
+  const [value, setValue] = createSignal("");
+
+  function handleSubmit(e: Event) {
+    e.preventDefault();
+    const uri = value().trim();
+    if (uri) {
+      props.onSubmit(uri);
+    }
+  }
+
+  return (
+    <form onSubmit={handleSubmit} class="grid gap-3">
+      <label class="grid gap-1.5">
+        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">
+          Target URI / handle / DID / PDS URL
+        </span>
+        <input
+          type="text"
+          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
+          placeholder="at://did:plc:… or handle.bsky.social"
+          value={value()}
+          onInput={(e) => setValue(e.currentTarget.value)} />
+      </label>
+
+      <button
+        type="submit"
+        disabled={!value().trim()}
+        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
+        <span class="flex items-center">
+          <i class="i-ri-compass-discover-line" />
+        </span>
+        Open in column
+      </button>
+    </form>
+  );
+}
+
+export function DiagnosticsPicker(props: { onSubmit: (did: string) => void }) {
+  const [value, setValue] = createSignal("");
+
+  function handleSubmit(e: Event) {
+    e.preventDefault();
+    const did = value().trim();
+    if (did) {
+      props.onSubmit(did);
+    }
+  }
+
+  return (
+    <form onSubmit={handleSubmit} class="grid gap-3">
+      <label class="grid gap-1.5">
+        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Handle or DID</span>
+        <input
+          type="text"
+          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
+          placeholder="handle.bsky.social or did:plc:…"
+          value={value()}
+          onInput={(e) => setValue(e.currentTarget.value)} />
+      </label>
+
+      <button
+        type="submit"
+        disabled={!value().trim()}
+        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
+        <span class="flex items-center">
+          <i class="i-ri-stethoscope-line" />
+        </span>
+        Open diagnostics
+      </button>
+    </form>
+  );
+}
+
+export function MessagesPicker(props: { onSubmit: () => void }) {
+  return (
+    <div class="grid gap-4">
+      <div class="rounded-2xl bg-white/4 p-4 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.04)]">
+        <div class="flex items-start gap-3">
+          <span class="mt-0.5 flex items-center text-primary">
+            <i class="i-ri-message-3-line" />
+          </span>
+          <div class="grid gap-1.5">
+            <p class="m-0 text-sm font-medium text-on-surface">Direct messages</p>
+            <p class="m-0 text-xs leading-relaxed text-on-surface-variant">
+              Opens your DM inbox inside the deck. Message content is blurred until you hover or focus the column.
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <button
+        type="button"
+        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25"
+        onClick={() => props.onSubmit()}>
+        <span class="flex items-center">
+          <i class="i-ri-layout-column-line" />
+        </span>
+        Add DM column
+      </button>
+    </div>
+  );
+}
diff --git a/src/components/deck/ColumnPicker/ProfileColumnPicker.tsx b/src/components/deck/ColumnPicker/ProfileColumnPicker.tsx
new file mode 100644
index 0000000..26e3dda
--- /dev/null
+++ b/src/components/deck/ColumnPicker/ProfileColumnPicker.tsx
@@ -0,0 +1,129 @@
+import { ActorSuggestionList, useActorSuggestions } from "$/components/actors/actor-search";
+import { Icon } from "$/components/shared/Icon";
+import type { LoginSuggestion } from "$/lib/types";
+import * as logger from "@tauri-apps/plugin-log";
+import { createSignal, Show } from "solid-js";
+import type { ProfileSelection } from "../types";
+
+function TypeaheadLoading(props: { visible: boolean }) {
+  return (
+    <Show when={props.visible}>
+      <span class="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-on-surface-variant">
+        <Icon kind="loader" class="animate-spin text-sm" />
+      </span>
+    </Show>
+  );
+}
+
+export function ProfilePicker(props: { onSubmit: (selection: ProfileSelection) => void }) {
+  let container: HTMLDivElement | undefined;
+  let input: HTMLInputElement | undefined;
+  const [value, setValue] = createSignal("");
+  const typeahead = useActorSuggestions({
+    container: () => container,
+    input: () => input,
+    onError: (error) => logger.warn(`Failed to load profile suggestions: ${String(error)}`),
+    value,
+  });
+
+  function submitManualActor() {
+    const actor = value().trim();
+    if (!actor) {
+      return;
+    }
+
+    typeahead.close();
+    props.onSubmit({ actor });
+  }
+
+  function submitSuggestion(suggestion: LoginSuggestion) {
+    typeahead.close();
+    props.onSubmit({
+      actor: suggestion.handle,
+      did: suggestion.did,
+      displayName: suggestion.displayName ?? null,
+      handle: suggestion.handle,
+    });
+  }
+
+  function handleKeyDown(event: KeyboardEvent) {
+    if (event.key === "ArrowDown") {
+      event.preventDefault();
+      typeahead.moveActiveIndex(1);
+      return;
+    }
+
+    if (event.key === "ArrowUp") {
+      event.preventDefault();
+      typeahead.moveActiveIndex(-1);
+      return;
+    }
+
+    if (event.key === "Escape") {
+      typeahead.close();
+      return;
+    }
+
+    if (event.key === "Enter" && typeahead.open() && typeahead.activeSuggestion()) {
+      event.preventDefault();
+      submitSuggestion(typeahead.activeSuggestion() as LoginSuggestion);
+    }
+  }
+
+  return (
+    <form
+      class="grid gap-3"
+      onSubmit={(event) => {
+        event.preventDefault();
+        submitManualActor();
+      }}>
+      <label class="grid gap-1.5">
+        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Handle or DID</span>
+        <div
+          class="relative"
+          ref={(element) => {
+            container = element as HTMLDivElement;
+          }}>
+          <input
+            ref={(element) => {
+              input = element;
+            }}
+            type="text"
+            role="combobox"
+            aria-autocomplete="list"
+            aria-controls="profile-suggestions"
+            aria-activedescendant={typeahead.activeIndex() >= 0
+              ? `profile-suggestions-option-${typeahead.activeIndex()}`
+              : undefined}
+            aria-expanded={typeahead.open()}
+            class="w-full rounded-xl border-0 bg-white/6 px-4 py-2.5 pr-10 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
+            placeholder="alice.bsky.social"
+            spellcheck={false}
+            value={value()}
+            onFocus={() => typeahead.focus()}
+            onInput={(event) => setValue(event.currentTarget.value)}
+            onKeyDown={(event) => handleKeyDown(event)} />
+
+          <TypeaheadLoading visible={typeahead.loading()} />
+          <ActorSuggestionList
+            activeIndex={typeahead.activeIndex()}
+            id="profile-suggestions"
+            open={typeahead.open()}
+            suggestions={typeahead.suggestions()}
+            title="Suggested profiles"
+            onSelect={submitSuggestion} />
+        </div>
+      </label>
+
+      <button
+        type="submit"
+        disabled={!value().trim()}
+        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
+        <span class="flex items-center">
+          <i class="i-ri-user-3-line" />
+        </span>
+        Open profile
+      </button>
+    </form>
+  );
+}
diff --git a/src/components/deck/ColumnPicker/SearchPicker.tsx b/src/components/deck/ColumnPicker/SearchPicker.tsx
new file mode 100644
index 0000000..0ea746a
--- /dev/null
+++ b/src/components/deck/ColumnPicker/SearchPicker.tsx
@@ -0,0 +1,69 @@
+import { SearchModeIcon } from "$/components/shared/Icon";
+import type { SearchMode } from "$/lib/api/types/search";
+import { createSignal } from "solid-js";
+
+function SearchModeButton(props: { active: boolean; disabled?: boolean; mode: SearchMode; onClick: () => void }) {
+  return (
+    <button
+      type="button"
+      disabled={props.disabled}
+      class="inline-flex items-center justify-center gap-2 rounded-xl border-0 px-3 py-2 text-xs font-medium transition duration-150 disabled:cursor-not-allowed disabled:opacity-40"
+      classList={{
+        "bg-primary/15 text-primary": props.active,
+        "bg-white/4 text-on-surface-variant hover:bg-white/8 hover:text-on-surface": !props.active && !props.disabled,
+      }}
+      onClick={() => props.onClick()}>
+      <SearchModeIcon mode={props.mode} class="text-sm" />
+      <span class="capitalize">{props.mode}</span>
+    </button>
+  );
+}
+
+export function SearchPicker(props: { onSubmit: (query: string, mode: SearchMode) => void }) {
+  const [mode, setMode] = createSignal<SearchMode>("network");
+  const [query, setQuery] = createSignal("");
+
+  function handleSubmit(event: Event) {
+    event.preventDefault();
+    const trimmed = query().trim();
+    if (!trimmed) {
+      return;
+    }
+
+    props.onSubmit(trimmed, mode());
+  }
+
+  return (
+    <form onSubmit={handleSubmit} class="grid gap-3">
+      <label class="grid gap-1.5">
+        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Search query</span>
+        <input
+          type="text"
+          class="rounded-xl border-0 bg-white/6 px-4 py-2.5 text-sm text-on-surface placeholder:text-on-surface-variant/50 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.06)] outline-none focus:shadow-[inset_0_0_0_1px_rgba(125,175,255,0.4)]"
+          placeholder="from:alice at protocol"
+          value={query()}
+          onInput={(event) => setQuery(event.currentTarget.value)} />
+      </label>
+
+      <div class="grid gap-1.5">
+        <span class="text-xs font-medium uppercase tracking-wide text-on-surface-variant">Search mode</span>
+        <div class="grid grid-cols-2 gap-2">
+          <SearchModeButton active={mode() === "network"} mode="network" onClick={() => setMode("network")} />
+          <SearchModeButton active={mode() === "keyword"} mode="keyword" onClick={() => setMode("keyword")} />
+          <SearchModeButton active={mode() === "semantic"} mode="semantic" onClick={() => setMode("semantic")} />
+          <SearchModeButton active={mode() === "hybrid"} mode="hybrid" onClick={() => setMode("hybrid")} />
+        </div>
+      </div>
+
+      <button
+        type="submit"
+        disabled={!query().trim()}
+        class="flex items-center justify-center gap-2 rounded-xl border-0 bg-primary/15 px-4 py-2.5 text-sm font-medium text-primary transition duration-150 hover:-translate-y-px hover:bg-primary/25 disabled:cursor-not-allowed disabled:opacity-40">
+        <span class="flex items-center">
+          <i class="i-ri-search-line" />
+        </span>
+        Open search column
+      </button>
+    </form>
+  );
+}
diff --git a/src/components/deck/AddColumnPanel.test.tsx b/src/components/deck/tests/AddColumnPanel.test.tsx
similarity index 98%
rename from src/components/deck/AddColumnPanel.test.tsx
rename to src/components/deck/tests/AddColumnPanel.test.tsx
index 1c45154..e5d52d8 100644
--- a/src/components/deck/AddColumnPanel.test.tsx
+++ b/src/components/deck/tests/AddColumnPanel.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render, screen, waitFor } from "@solidjs/testing-library";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { AddColumnPanel } from "./AddColumnPanel";
+import { AddColumnPanel } from "../AddColumnPanel";
 
 const getFeedGeneratorsMock = vi.hoisted(() => vi.fn());
 const getPreferencesMock = vi.hoisted(() => vi.fn());
diff --git a/src/components/deck/DiagnosticsPanel.test.tsx b/src/components/deck/tests/DiagnosticsPanel.test.tsx
similarity index 99%
rename from src/components/deck/DiagnosticsPanel.test.tsx
rename to src/components/deck/tests/DiagnosticsPanel.test.tsx
index fa0a74f..dc88fbe 100644
--- a/src/components/deck/DiagnosticsPanel.test.tsx
+++ b/src/components/deck/tests/DiagnosticsPanel.test.tsx
@@ -1,7 +1,7 @@
 import { AppTestProviders } from "$/test/providers";
 import { fireEvent, render, screen, waitFor } from "@solidjs/testing-library";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { DiagnosticsPanel } from "./DiagnosticsPanel";
+import { DiagnosticsPanel } from "../DiagnosticsPanel";
 
 const getAccountListsMock = vi.hoisted(() => vi.fn());
 const getAccountLabelsMock = vi.hoisted(() => vi.fn());
diff --git a/src/components/deck/types.test.ts b/src/components/deck/tests/types.test.ts
similarity index 95%
rename from src/components/deck/types.test.ts
rename to src/components/deck/tests/types.test.ts
index 6e55c96..c2f3da1 100644
--- a/src/components/deck/types.test.ts
+++ b/src/components/deck/tests/types.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { parseFeedConfig, resolveFeedColumn } from "./types";
+import { parseFeedConfig, resolveFeedColumn } from "../types";
 
 describe("deck feed column helpers", () => {
   it("rejects malformed feed configs", () => {
diff --git a/src/components/deck/types.ts b/src/components/deck/types.ts
index 553e53b..bdc8489 100644
--- a/src/components/deck/types.ts
+++ b/src/components/deck/types.ts
@@ -155,3 +155,12 @@ export function columnTitle(kind: string, config: string): string {
     }
   }
 }
+
+export type FeedPickerSelection = { feed: SavedFeedItem; title: string };
+
+export type ProfileSelection = {
+  actor: string;
+  did?: string | null;
+  displayName?: string | null;
+  handle?: string | null;
+};
diff --git a/src/components/feeds/PostCard.tsx b/src/components/feeds/PostCard.tsx
index 4902005..871428f 100644
--- a/src/components/feeds/PostCard.tsx
+++ b/src/components/feeds/PostCard.tsx
@@ -29,7 +29,7 @@ import type {
 } from "$/lib/types";
 import { formatCount, formatHandle, normalizeError } from "$/lib/utils/text";
 import * as logger from "@tauri-apps/plugin-log";
-import { createMemo, createSignal, type ParentProps, Show } from "solid-js";
+import { createMemo, createSignal, type ParentProps, Show, splitProps } from "solid-js";
 import { Motion } from "solid-motionone";
 import { EmbedContent } from "./embeds/ContentEmbed";
 import type { ReportTarget } from "./types";
@@ -117,69 +117,80 @@ function PostActionButton(props: PostActionButtonProps) {
   );
 }
 
-// FIXME: this is an absurdly large number of props
-type PostActionsProps = {
+type PostActionStatus = {
   bookmarkPending: boolean;
   isBookmarked: boolean;
   isLiked: boolean;
   isReposted: boolean;
   likeCount: string;
   likePending: boolean;
-  menuOpen: boolean;
   pulseLike: boolean;
   pulseRepost: boolean;
   replyCount: string;
   repostCount: string;
   repostPending: boolean;
-  triggerRef: (element: HTMLButtonElement) => void;
+};
+
+type PostActionHandlers = {
   onBookmark?: () => void;
   onLike?: () => void;
-  onMenuOpen: (element: HTMLButtonElement) => void;
   onOpenThread?: () => void;
   onQuote?: () => void;
   onReply?: () => void;
   onRepost?: () => void;
 };
 
+type PostActionsProps = {
+  handlers: PostActionHandlers;
+  menu: {
+    open: boolean;
+    onOpen: (element: HTMLButtonElement) => void;
+    triggerRef: (element: HTMLButtonElement) => void;
+  };
+  state: PostActionStatus;
+};
+
 function PostActions(props: PostActionsProps) {
+  const [status, menu, actions] = splitProps(props, ["state"], ["menu"], ["handlers"]);
+
   return (
     <footer class="mt-4 flex min-w-0 flex-wrap items-center gap-2 max-[520px]:gap-1">
       <PostActionButton
-        active={props.isLiked}
-        busy={props.likePending}
+        active={status.state.isLiked}
+        busy={status.state.likePending}
         icon="i-ri-heart-3-line"
         iconActive="i-ri-heart-3-fill"
-        label={props.likeCount}
-        pulse={props.pulseLike}
-        onClick={props.onLike} />
-      <PostActionButton icon="i-ri-chat-1-line" label={props.replyCount} onClick={props.onReply} />
+        label={status.state.likeCount}
+        pulse={status.state.pulseLike}
+        onClick={actions.handlers.onLike} />
+      <PostActionButton icon="i-ri-chat-1-line" label={status.state.replyCount} onClick={actions.handlers.onReply} />
       <PostActionButton
-        active={props.isReposted}
-        busy={props.repostPending}
+        active={status.state.isReposted}
+        busy={status.state.repostPending}
         icon="i-ri-repeat-2-line"
         iconActive="i-ri-repeat-2-fill"
-        label={props.repostCount}
-        pulse={props.pulseRepost}
-        onClick={props.onRepost} />
+        label={status.state.repostCount}
+        pulse={status.state.pulseRepost}
+        onClick={actions.handlers.onRepost} />
       <PostActionButton
-        active={props.isBookmarked}
-        busy={props.bookmarkPending}
+        active={status.state.isBookmarked}
+        busy={status.state.bookmarkPending}
         icon="i-ri-bookmark-line"
         iconActive="i-ri-bookmark-fill"
-        label={props.isBookmarked ? "Saved" : "Save"}
-        onClick={props.onBookmark} />
-      <PostActionButton icon="i-ri-chat-quote-line" label="Quote" onClick={props.onQuote} />
-      <PostActionButton icon="i-ri-node-tree" label="Thread" onClick={props.onOpenThread} />
+        label={status.state.isBookmarked ? "Saved" : "Save"}
+        onClick={actions.handlers.onBookmark} />
+      <PostActionButton icon="i-ri-chat-quote-line" label="Quote" onClick={actions.handlers.onQuote} />
+      <PostActionButton icon="i-ri-node-tree" label="Thread" onClick={actions.handlers.onOpenThread} />
       <button
         aria-label="More actions"
-        ref={(element) => props.triggerRef(element)}
-        aria-expanded={props.menuOpen}
+        ref={(element) => menu.menu.triggerRef(element)}
+        aria-expanded={menu.menu.open}
         aria-haspopup="menu"
         class="inline-flex items-center justify-center rounded-full border-0 bg-transparent px-3 py-2 text-xs text-on-surface-variant transition duration-150 ease-out hover:-translate-y-px hover:bg-white/5 hover:text-primary max-[520px]:px-2.5"
         type="button"
         onClick={(event) => {
           event.stopPropagation();
-          props.onMenuOpen(event.currentTarget);
+          menu.menu.onOpen(event.currentTarget);
         }}>
         <Icon aria-hidden="true" iconClass="i-ri-more-fill" />
       </button>
@@ -228,25 +239,32 @@ type PostCardProps = {
 };
 
 export function PostCard(props: PostCardProps) {
-  const authorName = createMemo(() => getDisplayName(props.post.author));
-  const createdAt = createMemo(() => formatRelativeTime(getPostCreatedAt(props.post)));
-  const isBookmarked = createMemo(() => !!props.post.viewer?.bookmarked);
-  const isLiked = createMemo(() => !!props.post.viewer?.like);
-  const isReposted = createMemo(() => !!props.post.viewer?.repost);
-  const likeCount = createMemo(() => formatCount(props.post.likeCount));
-  const postText = createMemo(() => getPostText(props.post));
-  const replyCount = createMemo(() => formatCount(props.post.replyCount));
-  const repostCount = createMemo(() => formatCount(props.post.repostCount));
-  const authorHandle = createMemo(() => formatHandle(props.post.author.handle, props.post.author.did));
-  const profileHref = createMemo(() => buildProfileRoute(getProfileRouteActor(props.post.author)));
-  const contentLabels = () => collectModerationLabels(props.post);
-  const mediaLabels = () => collectModerationLabels(props.post, props.post.embed);
-  const avatarLabels = () => collectModerationLabels(props.post.author);
-  const contentDecision = useModerationDecision(contentLabels);
-  const mediaDecision = useModerationDecision(mediaLabels);
-  const avatarDecision = useModerationDecision(avatarLabels);
+  const [view, interactions, actionFlags] = splitProps(
+    props,
+    ["focused", "item", "post", "registerRef", "showActions"],
+    ["onBookmark", "onFocus", "onLike", "onOpenThread", "onQuote", "onReply", "onRepost"],
+    ["bookmarkPending", "likePending", "pulseLike", "pulseRepost", "repostPending"],
+  );
+
+  const authorName = createMemo(() => getDisplayName(view.post.author));
+  const createdAt = createMemo(() => formatRelativeTime(getPostCreatedAt(view.post)));
+  const isBookmarked = createMemo(() => !!view.post.viewer?.bookmarked);
+  const isLiked = createMemo(() => !!view.post.viewer?.like);
+  const isReposted = createMemo(() => !!view.post.viewer?.repost);
+  const likeCount = createMemo(() => formatCount(view.post.likeCount));
+  const postText = createMemo(() => getPostText(view.post));
+  const replyCount = createMemo(() => formatCount(view.post.replyCount));
+  const repostCount = createMemo(() => formatCount(view.post.repostCount));
+  const authorHandle = createMemo(() => formatHandle(view.post.author.handle, view.post.author.did));
+  const profileHref = createMemo(() => buildProfileRoute(getProfileRouteActor(view.post.author)));
+  const contentLabels = () => collectModerationLabels(view.post);
+  const mediaLabels = () => collectModerationLabels(view.post, view.post.embed);
+  const avatarLabels = () => collectModerationLabels(view.post.author);
+  const contentDecision = useModerationDecision(contentLabels, "contentList");
+  const mediaDecision = useModerationDecision(mediaLabels, "contentMedia");
+  const avatarDecision = useModerationDecision(avatarLabels, "avatar");
   const reasonLabel = createMemo(() => {
-    const reason = props.item?.reason;
+    const reason = view.item?.reason;
     if (!reason || reason.$type !== "app.bsky.feed.defs#reasonRepost") {
       return null;
     }
@@ -255,7 +273,7 @@ export function PostCard(props: PostCardProps) {
   });
 
   const replyLabel = createMemo(() => {
-    const item = props.item;
+    const item = view.item;
     if (!item || !isReplyItem(item)) {
       return null;
     }
@@ -277,46 +295,46 @@ export function PostCard(props: PostCardProps) {
   const menuItems = createMemo<ContextMenuItem[]>(() => {
     const items: ContextMenuItem[] = [];
 
-    if (props.onReply) {
-      items.push({ icon: "i-ri-chat-1-line", label: "Reply", onSelect: props.onReply });
+    if (interactions.onReply) {
+      items.push({ icon: "i-ri-chat-1-line", label: "Reply", onSelect: interactions.onReply });
     }
 
-    if (props.onQuote) {
-      items.push({ icon: "i-ri-chat-quote-line", label: "Quote", onSelect: props.onQuote });
+    if (interactions.onQuote) {
+      items.push({ icon: "i-ri-chat-quote-line", label: "Quote", onSelect: interactions.onQuote });
     }
 
-    if (props.onLike) {
+    if (interactions.onLike) {
       items.push({
         icon: isLiked() ? "i-ri-heart-3-fill" : "i-ri-heart-3-line",
         label: isLiked() ? "Unlike" : "Like",
-        onSelect: props.onLike,
+        onSelect: interactions.onLike,
       });
     }
 
-    if (props.onRepost) {
+    if (interactions.onRepost) {
       items.push({
         icon: isReposted() ? "i-ri-repeat-2-fill" : "i-ri-repeat-2-line",
         label: isReposted() ? "Undo repost" : "Repost",
-        onSelect: props.onRepost,
+        onSelect: interactions.onRepost,
       });
     }
 
-    if (props.onBookmark) {
+    if (interactions.onBookmark) {
       items.push({
         icon: isBookmarked() ? "i-ri-bookmark-fill" : "i-ri-bookmark-line",
         label: isBookmarked() ? "Unsave" : "Save",
-        onSelect: props.onBookmark,
+        onSelect: interactions.onBookmark,
       });
     }
 
     items.push({
       icon: "i-ri-link-m",
       label: "Copy post link",
-      onSelect: () => void navigator.clipboard?.writeText(buildPublicPostUrl(props.post)),
+      onSelect: () => void navigator.clipboard?.writeText(buildPublicPostUrl(view.post)),
     });
 
-    if (props.onOpenThread) {
-      items.push({ icon: "i-ri-node-tree", label: "Open thread", onSelect: props.onOpenThread });
+    if (interactions.onOpenThread) {
+      items.push({ icon: "i-ri-node-tree", label: "Open thread", onSelect: interactions.onOpenThread });
     }
 
     items.push({
@@ -324,8 +342,8 @@ export function PostCard(props: PostCardProps) {
       label: "Report post",
       onSelect: () => {
         setReportTarget({
-          subject: { type: "record", uri: props.post.uri, cid: props.post.cid },
-          subjectLabel: `Post by @${props.post.author.handle}`,
+          subject: { type: "record", uri: view.post.uri, cid: view.post.cid },
+          subjectLabel: `Post by @${view.post.author.handle}`,
         });
         setReportOpen(true);
       },
@@ -334,12 +352,12 @@ export function PostCard(props: PostCardProps) {
       label: "Report account",
       onSelect: () => {
         setReportTarget({
-          subject: { type: "repo", did: props.post.author.did },
-          subjectLabel: `Account @${props.post.author.handle}`,
+          subject: { type: "repo", did: view.post.author.did },
+          subjectLabel: `Account @${view.post.author.handle}`,
         });
         setReportOpen(true);
       },
-    }, { icon: "i-ri-forbid-2-line", label: `Block @${props.post.author.handle}`, onSelect: () => void blockAuthor() });
+    }, { icon: "i-ri-forbid-2-line", label: `Block @${view.post.author.handle}`, onSelect: () => void blockAuthor() });
 
     return items;
   });
@@ -375,7 +393,7 @@ export function PostCard(props: PostCardProps) {
 
   async function blockAuthor() {
     const confirmed = globalThis.confirm
-      ? globalThis.confirm(`Block @${props.post.author.handle}? You can unblock from Bluesky settings.`)
+      ? globalThis.confirm(`Block @${view.post.author.handle}? You can unblock from Bluesky settings.`)
       : true;
 
     if (!confirmed) {
@@ -383,7 +401,7 @@ export function PostCard(props: PostCardProps) {
     }
 
     try {
-      await ModerationController.blockActor(props.post.author.did);
+      await ModerationController.blockActor(view.post.author.did);
     } catch (error) {
       logger.error("failed to block account", { keyValues: { error: normalizeError(error) } });
     }
@@ -391,11 +409,11 @@ export function PostCard(props: PostCardProps) {
 
   return (
     <article
-      ref={(element) => props.registerRef?.(element)}
+      ref={(element) => view.registerRef?.(element)}
       class="group min-w-0 overflow-hidden rounded-3xl bg-white/2.5 px-4 py-4 shadow-[inset_0_0_0_1px_rgba(255,255,255,0.03)] transition duration-150 ease-out hover:bg-white/4 max-[760px]:px-3.5 max-[760px]:py-3.5 max-[520px]:rounded-3xl max-[520px]:px-3 max-[520px]:py-3"
       classList={{
         "bg-[linear-gradient(135deg,rgba(125,175,255,0.11),rgba(0,115,222,0.06))] shadow-[inset_0_0_0_1px_rgba(125,175,255,0.22),0_0_0_1px_rgba(125,175,255,0.08)]":
-          !!props.focused,
+          !!view.focused,
       }}
       role="article"
       onContextMenu={(event) => {
@@ -421,15 +439,15 @@ export function PostCard(props: PostCardProps) {
       <div class="flex min-w-0 gap-3">
         <a class="shrink-0 no-underline" href={`#${profileHref()}`} onClick={(event) => event.stopPropagation()}>
           <ModeratedAvatar
-            avatar={props.post.author.avatar}
+            avatar={view.post.author.avatar}
             class="relative mt-0.5 h-11 w-11 shrink-0 overflow-hidden rounded-full bg-[linear-gradient(135deg,rgba(125,175,255,0.9),rgba(0,115,222,0.72))] shadow-[0_0_0_2px_rgba(14,14,14,1),0_0_0_3px_rgba(125,175,255,0.28)]"
             hidden={avatarDecision().filter || avatarDecision().blur !== "none"}
-            label={getAvatarLabel(props.post.author)}
+            label={getAvatarLabel(view.post.author)}
             fallbackClass="text-sm font-semibold text-on-primary-fixed" />
         </a>
 
         <div class="min-w-0 flex-1">
-          <PostPrimaryRegion onFocus={props.onFocus} onOpenThread={props.onOpenThread}>
+          <PostPrimaryRegion onFocus={interactions.onFocus} onOpenThread={interactions.onOpenThread}>
             <PostHeader
               authorName={authorName()}
               authorHandle={authorHandle()}
@@ -441,42 +459,48 @@ export function PostCard(props: PostCardProps) {
             <ModeratedPostBody
               decision={contentDecision()}
               labels={contentLabels()}
-              post={props.post}
+              post={view.post}
               text={postText()} />
 
-            <Show when={props.post.embed}>
+            <Show when={view.post.embed}>
               {(current) => (
                 <ModeratedBlurOverlay decision={mediaDecision()} labels={mediaLabels()} class="mt-4">
-                  <EmbedContent embed={current()} post={props.post} />
+                  <EmbedContent embed={current()} post={view.post} />
                 </ModeratedBlurOverlay>
               )}
             </Show>
           </PostPrimaryRegion>
 
-          <Show when={props.showActions !== false}>
+          <Show when={view.showActions !== false}>
             <PostActions
-              bookmarkPending={!!props.bookmarkPending}
-              isBookmarked={isBookmarked()}
-              isLiked={isLiked()}
-              isReposted={isReposted()}
-              likeCount={likeCount()}
-              likePending={!!props.likePending}
-              menuOpen={menuOpen()}
-              pulseLike={!!props.pulseLike}
-              pulseRepost={!!props.pulseRepost}
-              replyCount={replyCount()}
-              repostCount={repostCount()}
-              repostPending={!!props.repostPending}
-              triggerRef={(element) => {
-                menuTriggerRef = element;
+              handlers={{
+                onBookmark: interactions.onBookmark,
+                onLike: interactions.onLike,
+                onOpenThread: interactions.onOpenThread,
+                onQuote: interactions.onQuote,
+                onReply: interactions.onReply,
+                onRepost: interactions.onRepost,
+              }}
+              menu={{
+                open: menuOpen(),
+                onOpen: openMenuFromTrigger,
+                triggerRef: (element) => {
+                  menuTriggerRef = element;
+                },
               }}
-              onBookmark={props.onBookmark}
-              onLike={props.onLike}
-              onMenuOpen={openMenuFromTrigger}
-              onOpenThread={props.onOpenThread}
-              onQuote={props.onQuote}
-              onReply={props.onReply}
-              onRepost={props.onRepost} />
+              state={{
+                bookmarkPending: !!actionFlags.bookmarkPending,
+                isBookmarked: isBookmarked(),
+                isLiked: isLiked(),
+                isReposted: isReposted(),
+                likeCount: likeCount(),
+                likePending: !!actionFlags.likePending,
+                pulseLike: !!actionFlags.pulseLike,
+                pulseRepost: !!actionFlags.pulseRepost,
+                replyCount: replyCount(),
+                repostCount: repostCount(),
+                repostPending: !!actionFlags.repostPending,
+              }} />
           </Show>
         </div>
       </div>
diff --git a/src/components/moderation/useModerationDecision.test.tsx b/src/components/moderation/useModerationDecision.test.tsx
new file mode 100644
index 0000000..d762e60
--- /dev/null
+++ b/src/components/moderation/useModerationDecision.test.tsx
@@ -0,0 +1,45 @@
+import type { ModerationLabel } from "$/lib/types";
+import { render, waitFor } from "@solidjs/testing-library";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useModerationDecision } from "./useModerationDecision";
+
+const moderateContentMock = vi.hoisted(() => vi.fn());
+
+vi.mock("$/lib/api/moderation", () => ({ ModerationController: { moderateContent: moderateContentMock } }));
+
+function DecisionProbe(props: { context: "contentList" | "contentMedia"; labels: ModerationLabel[] }) {
+  const labels = () => props.labels;
+  const ctx = () => props.context;
+  const decision = useModerationDecision(labels, ctx());
+  return <span>{decision().blur}</span>;
+}
+
+describe("useModerationDecision", () => {
+  beforeEach(() => {
+    moderateContentMock.mockReset();
+    moderateContentMock.mockResolvedValue({
+      alert: false,
+      blur: "none",
+      filter: false,
+      inform: false,
+      noOverride: false,
+    });
+  });
+
+  it("includes context in its cache key", async () => {
+    const labels: ModerationLabel[] = [{ src: "did:plc:labeler", val: "warn", uri: "at://did:plc:alice/app.test/1" }];
+
+    const first = render(() => <DecisionProbe context="contentList" labels={labels} />);
+    await waitFor(() => expect(moderateContentMock).toHaveBeenCalledWith(labels, "contentList"));
+    expect(moderateContentMock).toHaveBeenCalledTimes(1);
+    first.unmount();
+
+    const second = render(() => <DecisionProbe context="contentList" labels={labels} />);
+    await waitFor(() => expect(moderateContentMock).toHaveBeenCalledTimes(1));
+    second.unmount();
+
+    render(() => <DecisionProbe context="contentMedia" labels={labels} />);
+    await waitFor(() => expect(moderateContentMock).toHaveBeenCalledWith(labels, "contentMedia"));
+    expect(moderateContentMock).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/components/moderation/useModerationDecision.ts b/src/components/moderation/useModerationDecision.ts
index 76fddfd..5f9f218 100644
--- a/src/components/moderation/useModerationDecision.ts
+++ b/src/components/moderation/useModerationDecision.ts
@@ -1,12 +1,15 @@
 import { ModerationController } from "$/lib/api/moderation";
 import { DEFAULT_MODERATION_DECISION, moderationLabelsKey } from "$/lib/moderation";
-import type { ModerationLabel, ModerationUiDecision } from "$/lib/types";
+import type { ModerationContext, ModerationLabel, ModerationUiDecision } from "$/lib/types";
 import { type Accessor, createMemo, createResource } from "solid-js";
 
 const decisionCache = new Map<string, ModerationUiDecision>();
 
-export function useModerationDecision(labelsAccessor: Accessor<ModerationLabel[]>) {
-  const cacheKey = createMemo(() => moderationLabelsKey(labelsAccessor()));
+export function useModerationDecision(labelsAccessor: Accessor<ModerationLabel[]>, context: ModerationContext) {
+  const cacheKey = createMemo(() => {
+    const labelKey = moderationLabelsKey(labelsAccessor());
+    return labelKey ? `${context}:${labelKey}` : "";
+  });
 
   const [decision] = createResource(cacheKey, async (key) => {
     if (!key) {
@@ -18,7 +21,7 @@ export function useModerationDecision(labelsAccessor: Accessor<ModerationLabel[]
       return cached;
     }
 
-    const next = await ModerationController.moderateContent(labelsAccessor());
+    const next = await ModerationController.moderateContent(labelsAccessor(), context);
     decisionCache.set(key, next);
     return next;
   }, { initialValue: DEFAULT_MODERATION_DECISION });
diff --git a/src/components/notifications/NotificationItem.tsx b/src/components/notifications/NotificationItem.tsx
index ebec769..d223b10 100644
--- a/src/components/notifications/NotificationItem.tsx
+++ b/src/components/notifications/NotificationItem.tsx
@@ -50,8 +50,8 @@ export function NotificationItem(props: NotificationItemProps & NotificationInte
   const detail = createMemo(() => postText() ?? followDetail(props.notification));
   const avatarLabels = () => collectModerationLabels(props.notification.author);
   const contentLabels = () => collectModerationLabels(props.notification);
-  const avatarDecision = useModerationDecision(avatarLabels);
-  const contentDecision = useModerationDecision(contentLabels);
+  const avatarDecision = useModerationDecision(avatarLabels, "avatar");
+  const contentDecision = useModerationDecision(contentLabels, "contentList");
 
   function openBodyTarget() {
     const uri = bodyTargetUri();
diff --git a/src/components/notifications/NotificationsPanel.tsx b/src/components/notifications/NotificationsPanel.tsx
index f14c70b..165ee5e 100644
--- a/src/components/notifications/NotificationsPanel.tsx
+++ b/src/components/notifications/NotificationsPanel.tsx
@@ -430,7 +430,7 @@ function GroupedAuthorAvatar(props: { actor: ProfileViewBasic; onClick: () => vo
   const label = createMemo(() => getAvatarLabel(props.actor));
   const profileHref = createMemo(() => buildProfileRoute(getProfileRouteActor(props.actor)));
   const labels = () => collectModerationLabels(props.actor);
-  const decision = useModerationDecision(labels);
+  const decision = useModerationDecision(labels, "avatar");
 
   return (
     <a
diff --git a/src/components/profile/ProfileHero.tsx b/src/components/profile/ProfileHero.tsx
index 3561cd2..fe71a6c 100644
--- a/src/components/profile/ProfileHero.tsx
+++ b/src/components/profile/ProfileHero.tsx
@@ -212,7 +212,7 @@ export function ProfileHero(
   const isFollowing = createMemo(() => !!props.profile.viewer?.following);
   const bannerStyle = createMemo(() => ({ transform: `translate3d(0, ${props.coverOffset}px, 0)` }));
   const profileLabels = () => collectModerationLabels(props.profile);
-  const profileDecision = useModerationDecision(profileLabels);
+  const profileDecision = useModerationDecision(profileLabels, "profileView");
 
   return (
     <header class="relative" ref={(element) => props.rootRef?.(element)}>
@@ -273,7 +273,7 @@ function ProfileAvatar(props: { profile: ProfileViewDetailed }) {
   const profile = () => props.profile;
   const label = createMemo(() => getAvatarLabel(props.profile));
   const labels = () => collectModerationLabels(props.profile);
-  const decision = useModerationDecision(labels);
+  const decision = useModerationDecision(labels, "avatar");
 
   return (
     <ModeratedAvatar
@@ -290,7 +290,7 @@ export function ProfileStickyHeader(props: { profile: ProfileViewDetailed; profi
   const displayName = createMemo(() => getDisplayName(props.profile));
   const visibleBadges = createMemo(() => props.profileBadges.slice(0, 2));
   const labels = () => collectModerationLabels(props.profile);
-  const decision = useModerationDecision(labels);
+  const decision = useModerationDecision(labels, "avatar");
 
   return (
     <div
diff --git a/src/components/settings/SettingsModeration.test.tsx b/src/components/settings/SettingsModeration.test.tsx
index 73b96de..f18502f 100644
--- a/src/components/settings/SettingsModeration.test.tsx
+++ b/src/components/settings/SettingsModeration.test.tsx
@@ -7,6 +7,7 @@ const setAdultContentEnabledMock = vi.hoisted(() => vi.fn());
 const setLabelPreferenceMock = vi.hoisted(() => vi.fn());
 const subscribeLabelerMock = vi.hoisted(() => vi.fn());
 const unsubscribeLabelerMock = vi.hoisted(() => vi.fn());
+const getLabelerPolicyDefinitionsMock = vi.hoisted(() => vi.fn());
 const getDistributionChannelMock = vi.hoisted(() => vi.fn());
 const openUrlMock = vi.hoisted(() => vi.fn());
 
@@ -19,6 +20,7 @@ vi.mock(
       setLabelPreference: setLabelPreferenceMock,
       subscribeLabeler: subscribeLabelerMock,
       unsubscribeLabeler: unsubscribeLabelerMock,
+      getLabelerPolicyDefinitions: getLabelerPolicyDefinitionsMock,
       getDistributionChannel: getDistributionChannelMock,
     },
   }),
@@ -38,6 +40,13 @@ describe("SettingsModeration", () => {
     setLabelPreferenceMock.mockResolvedValue(void 0);
     subscribeLabelerMock.mockResolvedValue(void 0);
     unsubscribeLabelerMock.mockResolvedValue(void 0);
+    getLabelerPolicyDefinitionsMock.mockResolvedValue([{
+      labelerDid: "did:plc:ar7c4by46qjdydhdevvrndac",
+      definitions: [{ identifier: "graphic-media", adultOnly: false, severity: "alert", blurs: "media", locales: [] }],
+    }, {
+      labelerDid: "did:plc:custom-labeler",
+      definitions: [{ identifier: "porn", adultOnly: true, severity: "alert", blurs: "media", locales: [] }],
+    }]);
     getDistributionChannelMock.mockResolvedValue("github");
     openUrlMock.mockResolvedValue(void 0);
   });
@@ -88,4 +97,14 @@ describe("SettingsModeration", () => {
       expect(setLabelPreferenceMock).toHaveBeenCalledWith("did:plc:ar7c4by46qjdydhdevvrndac", "graphic-media", "warn")
     );
   });
+
+  it("disables adult-only overrides when adult content is off", async () => {
+    render(() => <SettingsModeration />);
+
+    const helperText = await screen.findByText("Enable adult content to edit this label.");
+    const controls = helperText.closest("div");
+    const select = controls?.querySelector("select");
+    expect(select).toBeTruthy();
+    expect(select).toBeDisabled();
+  });
 });
diff --git a/src/components/settings/SettingsModeration.tsx b/src/components/settings/SettingsModeration.tsx
index 24f8b06..32ee36a 100644
--- a/src/components/settings/SettingsModeration.tsx
+++ b/src/components/settings/SettingsModeration.tsx
@@ -1,6 +1,11 @@
 import { ModerationController } from "$/lib/api/moderation";
 import { BUILTIN_LABELER_DID } from "$/lib/moderation";
-import type { ModerationLabelVisibility, StoredModerationPrefs } from "$/lib/types";
+import type {
+  ModerationLabelerPolicyDefinition,
+  ModerationLabelPolicyDefinition,
+  ModerationLabelVisibility,
+  StoredModerationPrefs,
+} from "$/lib/types";
 import { normalizeError } from "$/lib/utils/text";
 import * as logger from "@tauri-apps/plugin-log";
 import { openUrl } from "@tauri-apps/plugin-opener";
@@ -19,8 +24,8 @@ type DraftState = {
 
 const VISIBILITY_OPTIONS: ModerationLabelVisibility[] = ["ignore", "warn", "hide"];
 
-function isAdultOnlyLikeLabel(label: string) {
-  return /adult|nsfw|porn|sexual|nudity/iu.test(label);
+function normalizeLabelIdentifier(label: string) {
+  return label.trim().toLowerCase();
 }
 
 function VisibilityOptions() {
@@ -59,6 +64,7 @@ export function SettingsModeration() {
   const [savingAdult, setSavingAdult] = createSignal(false);
   const [busyLabelerDid, setBusyLabelerDid] = createSignal<string | null>(null);
   const [prefs, setPrefs] = createSignal<StoredModerationPrefs | null>(null);
+  const [policyDefinitions, setPolicyDefinitions] = createSignal<ModerationLabelerPolicyDefinition[]>([]);
   const [distributionChannel, setDistributionChannel] = createSignal("github");
   const [draft, setDraft] = createStore<DraftState>({
     addLabelerDid: "",
@@ -73,6 +79,28 @@ export function SettingsModeration() {
     return [BUILTIN_LABELER_DID, ...custom.filter((did) => did !== BUILTIN_LABELER_DID)];
   });
 
+  const policyDefinitionsByDid = createMemo(() => {
+    const map = new Map<string, Map<string, ModerationLabelPolicyDefinition>>();
+
+    for (const policy of policyDefinitions()) {
+      const byLabel = new Map<string, ModerationLabelPolicyDefinition>();
+      for (const definition of policy.definitions) {
+        byLabel.set(normalizeLabelIdentifier(definition.identifier), definition);
+      }
+      map.set(policy.labelerDid, byLabel);
+    }
+
+    return map;
+  });
+
+  const policyByDid = createMemo(() => {
+    const map = new Map<string, ModerationLabelerPolicyDefinition>();
+    for (const policy of policyDefinitions()) {
+      map.set(policy.labelerDid, policy);
+    }
+    return map;
+  });
+
   onMount(() => {
     void loadState();
   });
@@ -80,11 +108,13 @@ export function SettingsModeration() {
   async function loadState() {
     setLoading(true);
     try {
-      const [loadedPrefs, channel] = await Promise.all([
+      const [loadedPrefs, loadedPolicies, channel] = await Promise.all([
         ModerationController.getModerationPrefs(),
+        ModerationController.getLabelerPolicyDefinitions(),
         ModerationController.getDistributionChannel(),
       ]);
       setPrefs(loadedPrefs);
+      setPolicyDefinitions(loadedPolicies);
       setDistributionChannel(channel);
     } catch (error) {
       const message = normalizeError(error);
@@ -129,7 +159,7 @@ export function SettingsModeration() {
     setBusyLabelerDid(did);
     try {
       await ModerationController.subscribeLabeler(did);
-      await refreshPrefs();
+      await refreshModerationState();
       setDraft("addLabelerDid", "");
       feedback.queueFeedback({ kind: "success", message: "Labeler added." });
     } catch (error) {
@@ -149,7 +179,7 @@ export function SettingsModeration() {
     setBusyLabelerDid(did);
     try {
       await ModerationController.unsubscribeLabeler(did);
-      await refreshPrefs();
+      await refreshModerationState();
       feedback.queueFeedback({ kind: "success", message: "Labeler removed." });
     } catch (error) {
       const message = normalizeError(error);
@@ -202,13 +232,48 @@ export function SettingsModeration() {
     return entries.toSorted(([left], [right]) => left.localeCompare(right));
   }
 
+  function getPolicyDefinition(labelerDid: string, label: string) {
+    return policyDefinitionsByDid().get(labelerDid)?.get(normalizeLabelIdentifier(label));
+  }
+
+  function isAdultOnlyLabel(labelerDid: string, label: string) {
+    return !!getPolicyDefinition(labelerDid, label)?.adultOnly;
+  }
+
+  function getLabelDisplayName(labelerDid: string, label: string) {
+    const definition = getPolicyDefinition(labelerDid, label);
+    return definition?.displayName?.trim() || label;
+  }
+
+  function getLabelerTitle(did: string) {
+    const policy = policyByDid().get(did);
+    return policy?.labelerDisplayName?.trim() || policy?.labelerHandle?.trim() || did;
+  }
+
+  function getLabelerSubtitle(did: string) {
+    const policy = policyByDid().get(did);
+    if (!policy) {
+      return did === BUILTIN_LABELER_DID ? "Built-in Bluesky safety labeler" : null;
+    }
+
+    if (policy.labelerDisplayName?.trim() && policy.labelerHandle?.trim()) {
+      return `@${policy.labelerHandle.trim()}`;
+    }
+
+    return null;
+  }
+
   function isMasBuild() {
     return distributionChannel() === "mac_app_store";
   }
 
-  async function refreshPrefs() {
-    const next = await ModerationController.getModerationPrefs();
-    setPrefs(next);
+  async function refreshModerationState() {
+    const [nextPrefs, nextPolicies] = await Promise.all([
+      ModerationController.getModerationPrefs(),
+      ModerationController.getLabelerPolicyDefinitions(),
+    ]);
+    setPrefs(nextPrefs);
+    setPolicyDefinitions(nextPolicies);
   }
 
   return (
@@ -260,9 +325,9 @@ export function SettingsModeration() {
                   {(did) => (
                     <div class="flex flex-wrap items-center justify-between gap-2 rounded-xl bg-black/25 px-3 py-2">
                       <div class="grid gap-0.5">
-                        <span class="text-xs font-medium text-on-surface">{did}</span>
-                        <Show when={did === BUILTIN_LABELER_DID}>
-                          <span class="text-[0.7rem] text-on-surface-variant">Built-in Bluesky safety labeler</span>
+                        <span class="text-xs font-medium text-on-surface">{getLabelerTitle(did)}</span>
+                        <Show when={getLabelerSubtitle(did)}>
+                          {(subtitle) => <span class="text-[0.7rem] text-on-surface-variant">{subtitle()}</span>}
                         </Show>
                       </div>
                       <Show when={did !== BUILTIN_LABELER_DID}>
@@ -319,10 +384,25 @@ export function SettingsModeration() {
                             fallback={<p class="m-0 text-xs text-on-surface-variant">No overrides yet.</p>}>
                             <For each={entries()}>
                               {([label, visibility]) => {
-                                const gated = !current().adultContentEnabled && isAdultOnlyLikeLabel(label);
+                                const definition = getPolicyDefinition(did, label);
+                                const gated = !current().adultContentEnabled && isAdultOnlyLabel(did, label);
+                                const displayName = getLabelDisplayName(did, label);
                                 return (
                                   <div class="grid gap-1 rounded-lg bg-black/30 px-3 py-2">
-                                    <span class="text-xs text-on-surface">{label}</span>
+                                    <span class="text-xs text-on-surface">{displayName}</span>
+                                    <Show when={displayName !== label}>
+                                      <span class="text-[0.7rem] text-on-surface-variant">Identifier: {label}</span>
+                                    </Show>
+                                    <Show when={definition}>
+                                      {(currentDefinition) => (
+                                        <span class="text-[0.7rem] text-on-surface-variant">
+                                          {currentDefinition().severity} • {currentDefinition().blurs}
+                                          <Show when={currentDefinition().defaultSetting}>
+                                            {(defaultSetting) => ` • default ${defaultSetting()}`}
+                                          </Show>
+                                        </span>
+                                      )}
+                                    </Show>
                                     <div class="flex flex-wrap items-center gap-2">
                                       <select
                                         value={visibility}
diff --git a/src/components/settings/SettingsPanel.test.tsx b/src/components/settings/SettingsPanel.test.tsx
index 4c049e2..9eba863 100644
--- a/src/components/settings/SettingsPanel.test.tsx
+++ b/src/components/settings/SettingsPanel.test.tsx
@@ -18,6 +18,7 @@ const setAdultContentEnabledMock = vi.hoisted(() => vi.fn());
 const setLabelPreferenceMock = vi.hoisted(() => vi.fn());
 const subscribeLabelerMock = vi.hoisted(() => vi.fn());
 const unsubscribeLabelerMock = vi.hoisted(() => vi.fn());
+const getLabelerPolicyDefinitionsMock = vi.hoisted(() => vi.fn());
 const getDistributionChannelMock = vi.hoisted(() => vi.fn());
 const dialogOpenMock = vi.hoisted(() => vi.fn());
 const navigateMock = vi.hoisted(() => vi.fn());
@@ -58,6 +59,7 @@ vi.mock(
       setLabelPreference: setLabelPreferenceMock,
       subscribeLabeler: subscribeLabelerMock,
       unsubscribeLabeler: unsubscribeLabelerMock,
+      getLabelerPolicyDefinitions: getLabelerPolicyDefinitionsMock,
       getDistributionChannel: getDistributionChannelMock,
     },
   }),
@@ -147,6 +149,7 @@ describe("SettingsPanel", () => {
     setLabelPreferenceMock.mockResolvedValue(void 0);
     subscribeLabelerMock.mockResolvedValue(void 0);
     unsubscribeLabelerMock.mockResolvedValue(void 0);
+    getLabelerPolicyDefinitionsMock.mockResolvedValue([]);
     getDistributionChannelMock.mockResolvedValue("github");
     dialogOpenMock.mockResolvedValue(null);
   });
diff --git a/src/lib/api/moderation.ts b/src/lib/api/moderation.ts
index 2582af9..eb203d3 100644
--- a/src/lib/api/moderation.ts
+++ b/src/lib/api/moderation.ts
@@ -1,7 +1,9 @@
 import { DEFAULT_MODERATION_DECISION } from "$/lib/moderation";
 import type {
   DistributionChannel,
+  ModerationContext,
   ModerationLabel,
+  ModerationLabelerPolicyDefinition,
   ModerationLabelVisibility,
   ModerationReasonType,
   ModerationUiDecision,
@@ -31,15 +33,21 @@ async function unsubscribeLabeler(did: string) {
   return invoke<void>("unsubscribe_labeler", { did });
 }
 
-async function moderateContent(labels: ModerationLabel[]): Promise<ModerationUiDecision> {
+async function getLabelerPolicyDefinitions() {
+  return invoke<ModerationLabelerPolicyDefinition[]>("get_labeler_policy_definitions");
+}
+
+async function moderateContent(labels: ModerationLabel[], context: ModerationContext): Promise<ModerationUiDecision> {
   if (labels.length === 0) {
     return DEFAULT_MODERATION_DECISION;
   }
 
   try {
-    return await invoke<ModerationUiDecision>("moderate_content", { labelsJson: JSON.stringify(labels) });
+    return await invoke<ModerationUiDecision>("moderate_content", { labelsJson: JSON.stringify(labels), context });
   } catch (error) {
-    logger.warn("moderation decision failed", { keyValues: { error: String(error), labels: String(labels.length) } });
+    logger.warn("moderation decision failed", {
+      keyValues: { context, error: String(error), labels: String(labels.length) },
+    });
     return DEFAULT_MODERATION_DECISION;
   }
 }
@@ -67,6 +75,7 @@ export const ModerationController = {
   setLabelPreference,
   subscribeLabeler,
   unsubscribeLabeler,
+  getLabelerPolicyDefinitions,
   moderateContent,
   createReport,
   getDistributionChannel,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index d640771..dad9db5 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -12,6 +12,37 @@ export type ModerationUiDecision = {
 
 export type ModerationLabelVisibility = "ignore" | "warn" | "hide";
 
+export type ModerationContext =
+  | "contentList"
+  | "contentView"
+  | "contentMedia"
+  | "avatar"
+  | "profileList"
+  | "profileView";
+
+export type ModerationLabelPolicyLocale = { lang: string; name: string; description: string };
+
+export type ModerationLabelPolicyDefinition = {
+  identifier: string;
+  adultOnly: boolean;
+  defaultSetting?: string | null;
+  severity: string;
+  blurs: string;
+  displayName?: string | null;
+  description?: string | null;
+  locales: ModerationLabelPolicyLocale[];
+};
+
+export type ModerationLabelerPolicyDefinition = {
+  labelerDid: string;
+  labelerHandle?: string | null;
+  labelerDisplayName?: string | null;
+  reasonTypes?: string[] | null;
+  subjectTypes?: string[] | null;
+  subjectCollections?: string[] | null;
+  definitions: ModerationLabelPolicyDefinition[];
+};
+
 export type StoredModerationPrefs = {
   adultContentEnabled: boolean;
   subscribedLabelers: string[];