birdclaw 0.8.4 → 0.9.0

package/dist/cli/birdclaw.js

@@ -487,6 +487,107 @@ var definitions = {
       ]
     }
   },
+  x_lists: {
+    exportSql: `
+      select account_id, list_id, name, description, owner_profile_id,
+        owner_external_user_id, is_private, member_count, follower_count,
+        source, membership_status, lists_synced_at, members_synced_at,
+        member_page_count, member_result_count, rate_limit_json, raw_json,
+        updated_at
+      from x_lists
+      order by account_id, name collate nocase, list_id
+    `,
+    ...fixedShard("data/lists/lists.jsonl", "x_lists"),
+    merge: {
+      order: 9,
+      sql: `
+      insert into x_lists (
+        account_id, list_id, name, description, owner_profile_id,
+        owner_external_user_id, is_private, member_count, follower_count,
+        source, membership_status, lists_synced_at, members_synced_at,
+        member_page_count, member_result_count, rate_limit_json, raw_json,
+        updated_at
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      on conflict(account_id, list_id) do update set
+        name = excluded.name,
+        description = excluded.description,
+        owner_profile_id = coalesce(excluded.owner_profile_id, x_lists.owner_profile_id),
+        owner_external_user_id = coalesce(excluded.owner_external_user_id, x_lists.owner_external_user_id),
+        is_private = case when excluded.updated_at >= x_lists.updated_at then excluded.is_private else x_lists.is_private end,
+        member_count = coalesce(excluded.member_count, x_lists.member_count),
+        follower_count = coalesce(excluded.follower_count, x_lists.follower_count),
+        source = case when excluded.updated_at >= x_lists.updated_at then excluded.source else x_lists.source end,
+        membership_status = case when excluded.updated_at >= x_lists.updated_at then excluded.membership_status else x_lists.membership_status end,
+        lists_synced_at = max(x_lists.lists_synced_at, excluded.lists_synced_at),
+        members_synced_at = nullif(max(coalesce(x_lists.members_synced_at, ''), coalesce(excluded.members_synced_at, '')), ''),
+        member_page_count = case when excluded.updated_at >= x_lists.updated_at then excluded.member_page_count else x_lists.member_page_count end,
+        member_result_count = case when excluded.updated_at >= x_lists.updated_at then excluded.member_result_count else x_lists.member_result_count end,
+        rate_limit_json = case when excluded.updated_at >= x_lists.updated_at then excluded.rate_limit_json else x_lists.rate_limit_json end,
+        raw_json = case when excluded.updated_at >= x_lists.updated_at then excluded.raw_json else x_lists.raw_json end,
+        updated_at = max(x_lists.updated_at, excluded.updated_at)
+      `,
+      columns: [
+        "account_id",
+        "list_id",
+        "name",
+        "description",
+        "owner_profile_id",
+        "owner_external_user_id",
+        "is_private",
+        "member_count",
+        "follower_count",
+        "source",
+        "membership_status",
+        "lists_synced_at",
+        "members_synced_at",
+        "member_page_count",
+        "member_result_count",
+        "rate_limit_json",
+        "raw_json",
+        "updated_at"
+      ]
+    }
+  },
+  x_list_members: {
+    exportSql: `
+      select account_id, list_id, profile_id, external_user_id, source,
+        current, first_seen_at, last_seen_at, ended_at, raw_json, updated_at
+      from x_list_members
+      order by account_id, list_id, profile_id
+    `,
+    ...fixedShard("data/lists/members.jsonl", "x_list_members"),
+    merge: {
+      order: 10,
+      sql: `
+      insert into x_list_members (
+        account_id, list_id, profile_id, external_user_id, source, current,
+        first_seen_at, last_seen_at, ended_at, raw_json, updated_at
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      on conflict(account_id, list_id, profile_id) do update set
+        external_user_id = coalesce(nullif(excluded.external_user_id, ''), x_list_members.external_user_id),
+        source = case when excluded.updated_at >= x_list_members.updated_at then excluded.source else x_list_members.source end,
+        current = case when excluded.updated_at >= x_list_members.updated_at then excluded.current else x_list_members.current end,
+        first_seen_at = min(x_list_members.first_seen_at, excluded.first_seen_at),
+        last_seen_at = max(x_list_members.last_seen_at, excluded.last_seen_at),
+        ended_at = case when excluded.updated_at >= x_list_members.updated_at then excluded.ended_at else x_list_members.ended_at end,
+        raw_json = case when excluded.updated_at >= x_list_members.updated_at then excluded.raw_json else x_list_members.raw_json end,
+        updated_at = max(x_list_members.updated_at, excluded.updated_at)
+      `,
+      columns: [
+        "account_id",
+        "list_id",
+        "profile_id",
+        "external_user_id",
+        "source",
+        "current",
+        "first_seen_at",
+        "last_seen_at",
+        "ended_at",
+        "raw_json",
+        "updated_at"
+      ]
+    }
+  },
   tweets: {
     exportSql: `
       select id, author_profile_id, text, created_at, is_replied, reply_to_id,
@@ -498,7 +599,7 @@ var definitions = {
     matchesPath: (candidate) => candidate.startsWith("data/tweets/"),
     countKey: () => "tweets",
     merge: {
-      order: 9,
+      order: 11,
       transform: sanitizeImportedTweets,
       sql: `
       insert into tweets (
@@ -556,7 +657,7 @@ var definitions = {
     matchesPath: (candidate) => candidate.startsWith("data/collections/"),
     countKey: (candidate) => `collections_${pathLeaf(candidate).replace(/\.jsonl$/, "") || "unknown"}`,
     merge: {
-      order: 10,
+      order: 12,
       sql: `
       insert into tweet_collections (
         account_id, tweet_id, kind, collected_at, source, raw_json, updated_at
@@ -595,7 +696,7 @@ var definitions = {
     matchesPath: (candidate) => candidate.startsWith("data/timeline_edges/"),
     countKey: (candidate) => `timeline_edges_${pathLeaf(candidate).replace(/\.jsonl$/, "") || "unknown"}`,
     merge: {
-      order: 11,
+      order: 13,
       sql: `
       insert into tweet_account_edges (
         account_id, tweet_id, kind, first_seen_at, last_seen_at, seen_count,
@@ -634,7 +735,7 @@ var definitions = {
     `,
     ...fixedShard("data/dms/conversations.jsonl", "dm_conversations"),
     merge: {
-      order: 12,
+      order: 14,
       sql: `
       insert into dm_conversations (
         id, account_id, participant_profile_id, title, inbox_kind, last_message_at, unread_count, needs_reply
@@ -675,7 +776,7 @@ var definitions = {
     matchesPath: (candidate) => candidate.startsWith("data/dms/") && candidate !== "data/dms/conversations.jsonl",
     countKey: () => "dm_messages",
     merge: {
-      order: 13,
+      order: 15,
       sql: `
       insert into dm_messages (
         id, conversation_id, sender_profile_id, text, created_at, direction, is_replied, media_count
@@ -716,7 +817,7 @@ var definitions = {
     `,
     ...fixedShard("data/links/url_expansions.jsonl", "url_expansions"),
     merge: {
-      order: 14,
+      order: 16,
       transform: sanitizeImportedUrlExpansions,
       sql: `
       insert into url_expansions (
@@ -764,7 +865,7 @@ var definitions = {
     `,
     ...fixedShard("data/links/occurrences.jsonl", "link_occurrences"),
     merge: {
-      order: 15,
+      order: 17,
       sql: `
       insert into link_occurrences (
         source_kind, source_id, source_position, short_url, account_id,
@@ -796,7 +897,7 @@ var definitions = {
     `,
     ...fixedShard("data/moderation/blocks.jsonl", "blocks"),
     merge: {
-      order: 16,
+      order: 18,
       sql: `
       insert into blocks (account_id, profile_id, source, created_at)
       values (?, ?, ?, ?)
@@ -815,7 +916,7 @@ var definitions = {
     `,
     ...fixedShard("data/moderation/mutes.jsonl", "mutes"),
     merge: {
-      order: 17,
+      order: 19,
       sql: `
       insert into mutes (account_id, profile_id, source, created_at)
       values (?, ?, ?, ?)
@@ -834,7 +935,7 @@ var definitions = {
     `,
     ...fixedShard("data/actions/tweet_actions.jsonl", "tweet_actions"),
     merge: {
-      order: 18,
+      order: 20,
       sql: `
       insert into tweet_actions (id, account_id, tweet_id, kind, body, created_at)
       values (?, ?, ?, ?, ?, ?)
@@ -856,7 +957,7 @@ var definitions = {
     `,
     ...fixedShard("data/ai_scores.jsonl", "ai_scores"),
     merge: {
-      order: 19,
+      order: 21,
       sql: `
       insert into ai_scores (
         entity_kind, entity_id, model, score, summary, reasoning, updated_at
@@ -2402,6 +2503,43 @@ var BASE_SCHEMA_SQL = `
     snapshot_id text not null
   );
 
+  create table if not exists x_lists (
+    account_id text not null,
+    list_id text not null,
+    name text not null,
+    description text not null default '',
+    owner_profile_id text,
+    owner_external_user_id text,
+    is_private integer not null default 0,
+    member_count integer,
+    follower_count integer,
+    source text not null,
+    membership_status text not null default 'not_synced',
+    lists_synced_at text not null,
+    members_synced_at text,
+    member_page_count integer not null default 0,
+    member_result_count integer not null default 0,
+    rate_limit_json text not null default '{}',
+    raw_json text not null default '{}',
+    updated_at text not null,
+    primary key (account_id, list_id)
+  );
+
+  create table if not exists x_list_members (
+    account_id text not null,
+    list_id text not null,
+    profile_id text not null,
+    external_user_id text not null,
+    source text not null,
+    current integer not null default 1,
+    first_seen_at text not null,
+    last_seen_at text not null,
+    ended_at text,
+    raw_json text not null default '{}',
+    updated_at text not null,
+    primary key (account_id, list_id, profile_id)
+  );
+
   create table if not exists geocoded_locations (
     normalized_key text primary key,
     original text not null,
@@ -2474,6 +2612,9 @@ var INDEX_SQL = `
   create index if not exists idx_follow_edges_profile on follow_edges(profile_id, current);
   create index if not exists idx_follow_snapshots_account on follow_snapshots(account_id, direction, completed_at desc);
   create index if not exists idx_follow_events_account on follow_events(account_id, direction, kind, event_at desc);
+  create index if not exists idx_x_lists_account_name on x_lists(account_id, name collate nocase, list_id);
+  create index if not exists idx_x_list_members_current on x_list_members(account_id, list_id, current, profile_id);
+  create index if not exists idx_x_list_members_profile on x_list_members(profile_id, current, account_id, list_id);
   create index if not exists idx_geocoded_locations_country on geocoded_locations(country_code);
   create index if not exists idx_geocoded_locations_last_used on geocoded_locations(last_used_at desc);
   create index if not exists idx_geocoded_unresolved_ttl on geocoded_locations_unresolved(ttl_until desc);
@@ -2735,6 +2876,50 @@ function ensureFollowGraphTables(db) {
     );
 	`);
 }
+function ensureXListTables(db) {
+  db.exec(`
+    create table if not exists x_lists (
+      account_id text not null,
+      list_id text not null,
+      name text not null,
+      description text not null default '',
+      owner_profile_id text,
+      owner_external_user_id text,
+      is_private integer not null default 0,
+      member_count integer,
+      follower_count integer,
+      source text not null,
+      membership_status text not null default 'not_synced',
+      lists_synced_at text not null,
+      members_synced_at text,
+      member_page_count integer not null default 0,
+      member_result_count integer not null default 0,
+      rate_limit_json text not null default '{}',
+      raw_json text not null default '{}',
+      updated_at text not null,
+      primary key (account_id, list_id)
+    );
+
+    create table if not exists x_list_members (
+      account_id text not null,
+      list_id text not null,
+      profile_id text not null,
+      external_user_id text not null,
+      source text not null,
+      current integer not null default 1,
+      first_seen_at text not null,
+      last_seen_at text not null,
+      ended_at text,
+      raw_json text not null default '{}',
+      updated_at text not null,
+      primary key (account_id, list_id, profile_id)
+    );
+
+    create index if not exists idx_x_lists_account_name on x_lists(account_id, name collate nocase, list_id);
+    create index if not exists idx_x_list_members_current on x_list_members(account_id, list_id, current, profile_id);
+    create index if not exists idx_x_list_members_profile on x_list_members(profile_id, current, account_id, list_id);
+  `);
+}
 function backfillTweetCollections(db) {
   const missingKinds = [
     ["likes", "liked"],
@@ -2880,6 +3065,13 @@ var DATABASE_MIGRATIONS = [
     version: 2,
     name: "normalize tweet account and collection state",
     up: normalizeTweetState
+  },
+  {
+    version: 3,
+    name: "add durable X List metadata and membership",
+    up: (db) => {
+      ensureXListTables(db);
+    }
   }
 ];
 function ensureDemoData(db) {
@@ -3115,6 +3307,8 @@ var ImportRepository = class {
   }
   clearBackupImport() {
     this.db.exec(`
+      delete from x_list_members;
+      delete from x_lists;
       delete from follow_events;
       delete from follow_edges;
       delete from follow_snapshot_members;
@@ -3522,10 +3716,11 @@ function runSubprocessEffect(options) {
 }
 
 // src/lib/backup.ts
-var BACKUP_SCHEMA_VERSION = 2;
+var BACKUP_SCHEMA_VERSION = 3;
 var MIN_SUPPORTED_BACKUP_SCHEMA_VERSION = 1;
 var MANIFEST_PATH = "manifest.json";
 var DATA_DIR = "data";
+var GITATTRIBUTES_PATH = ".gitattributes";
 var AUTO_SYNC_CACHE_KEY = "backup:auto-sync";
 var DEFAULT_STALE_AFTER_SECONDS = 15 * 60;
 var autoUpdateInFlight = null;
@@ -3750,6 +3945,8 @@ data/moderation/mutes.jsonl
 data/follow_snapshots.jsonl
 data/follow_snapshot_members.jsonl
 data/follow_edges.jsonl
+data/lists/lists.jsonl
+data/lists/members.jsonl
 data/follow_events.jsonl
 \`\`\`
 
@@ -3787,6 +3984,36 @@ function readPreviousManifestEffect(repoPath) {
     Effect5.catchAll(() => Effect5.succeed(void 0))
   );
 }
+function ensureBackupGitattributesEffect(repoPath) {
+  return Effect5.gen(function* () {
+    const attributesPath = yield* trySync2(
+      () => resolveBackupFilePath(repoPath, GITATTRIBUTES_PATH)
+    );
+    yield* assertNoSymlinkAncestorEffect(repoPath, attributesPath);
+    const requiredLines = [
+      "data/**/*.jsonl text eol=lf",
+      `${MANIFEST_PATH} text eol=lf`
+    ];
+    const generatedBlock = [
+      "# BEGIN birdclaw backup attributes",
+      "# Backup hashes use the raw LF-delimited bytes written by Birdclaw.",
+      ...requiredLines,
+      "# END birdclaw backup attributes",
+      ""
+    ].join("\n");
+    const current = yield* tryPromise(
+      () => fs.readFile(attributesPath, "utf8")
+    ).pipe(Effect5.option);
+    if (current._tag === "Some" && current.value.endsWith(generatedBlock)) {
+      return;
+    }
+    const preserved = current._tag === "Some" ? current.value.replaceAll(generatedBlock, "").replace(/[\r\n]+$/u, "") : "";
+    const content = preserved ? `${preserved}
+
+${generatedBlock}` : generatedBlock;
+    yield* tryPromise(() => fs.writeFile(attributesPath, content, "utf8"));
+  });
+}
 function maybeCommitAndPushEffect({
   repoPath,
   message,
@@ -3797,20 +4024,21 @@ function maybeCommitAndPushEffect({
     return Effect5.succeed(void 0);
   }
   return Effect5.gen(function* () {
-    yield* gitEffect([
-      "-C",
-      repoPath,
-      "rev-parse",
-      "--is-inside-work-tree"
-    ]).pipe(
-      Effect5.catchAll(
-        () => gitEffect(["-C", repoPath, "init"]).pipe(Effect5.asVoid)
-      )
-    );
+    if (!(yield* isGitRepoEffect(repoPath))) {
+      yield* gitEffect(["-C", repoPath, "init"]);
+    }
+    if (!(yield* isGitRepoEffect(repoPath))) {
+      return yield* Effect5.fail(
+        new Error(
+          "Backup Git operations must run at the configured repository root"
+        )
+      );
+    }
     yield* gitEffect([
       "-C",
       repoPath,
       "add",
+      GITATTRIBUTES_PATH,
       "README.md",
       MANIFEST_PATH,
       DATA_DIR
@@ -3878,6 +4106,9 @@ function maybeCommitAndPushEffect({
   });
 }
 function isGitRepoEffect(repoPath) {
+  if (!existsSync2(path2.join(repoPath, ".git"))) {
+    return Effect5.succeed(false);
+  }
   return gitEffect(["-C", repoPath, "rev-parse", "--is-inside-work-tree"]).pipe(
     Effect5.as(true),
     Effect5.catchAll(() => Effect5.succeed(false))
@@ -3934,7 +4165,7 @@ function ensureBackupGitRepoEffect({
         repoPath,
         "fetch",
         "origin",
-        "main"
+        "main:refs/remotes/origin/main"
       ]).pipe(
         Effect5.flatMap(
           () => gitEffect(["-C", repoPath, "checkout", "-B", "main", "origin/main"])
@@ -3983,6 +4214,7 @@ function exportBackupEffect({
         new Error("Backup repository path must be a real directory")
       );
     }
+    yield* ensureBackupGitattributesEffect(resolvedRepoPath);
     yield* ensureBackupReadmeEffect(resolvedRepoPath);
     const shards = yield* trySync2(() => buildShards(database));
     const shardEntries = yield* trySync2(
@@ -6133,6 +6365,16 @@ function runBirdJsonCommandAllowFailureEffect(args, timeoutMs) {
     })
   );
 }
+function runBirdTweetJsonCommandEffect(args, timeoutMs) {
+  return runBirdJsonCommandEffect([...args, "--json-full"], timeoutMs).pipe(
+    Effect8.catchAll((error) => {
+      if (!isUnsupportedBirdOptionError(error, "--json-full")) {
+        return Effect8.fail(error);
+      }
+      return runBirdJsonCommandEffect([...args, "--json"], timeoutMs);
+    })
+  );
+}
 function getBirdTweetItems(payload, command) {
   if (Array.isArray(payload)) {
     return payload;
@@ -6197,19 +6439,63 @@ function toReferencedTweets(item) {
   }
   return references.length > 0 ? references : void 0;
 }
+function getRecord(value) {
+  return value && typeof value === "object" ? value : void 0;
+}
+function findGraphqlAvatarUrl(value, authorId) {
+  const pending = [value];
+  const seen = /* @__PURE__ */ new Set();
+  while (pending.length > 0) {
+    const current = pending.pop();
+    const record3 = getRecord(current);
+    if (!record3 || seen.has(record3)) continue;
+    seen.add(record3);
+    if (record3.rest_id === authorId) {
+      const avatar = getRecord(record3.avatar);
+      if (typeof avatar?.image_url === "string" && avatar.image_url) {
+        return avatar.image_url;
+      }
+    }
+    for (const child of Object.values(record3)) {
+      if (child && typeof child === "object") {
+        pending.push(child);
+      }
+    }
+  }
+  return void 0;
+}
+function isHydratedBirdTweetItem(value) {
+  const item = value;
+  return typeof item?.id === "string" && typeof item.text === "string" && typeof item.createdAt === "string";
+}
 function normalizeBirdTweets(items) {
   const users = /* @__PURE__ */ new Map();
-  const data = items.map((item) => {
+  const includedTweets = /* @__PURE__ */ new Map();
+  const normalizeItem = (item, preserveMissingMetrics = false) => {
     const authorId = String(
       item.authorId ?? item.author?.username ?? "unknown"
     );
-    if (!users.has(authorId)) {
+    const profileImageUrl = item.author?.profileImageUrl ?? findGraphqlAvatarUrl(item._raw, authorId);
+    const existingUser = users.get(authorId);
+    if (!existingUser) {
       users.set(authorId, {
         id: authorId,
         username: item.author?.username ?? `user_${authorId}`,
-        name: item.author?.name ?? item.author?.username ?? `user_${authorId}`
+        name: item.author?.name ?? item.author?.username ?? `user_${authorId}`,
+        ...profileImageUrl ? { profile_image_url: profileImageUrl } : {}
+      });
+    } else if (profileImageUrl && !existingUser.profile_image_url) {
+      users.set(authorId, {
+        ...existingUser,
+        profile_image_url: profileImageUrl
       });
     }
+    if (isHydratedBirdTweetItem(item.quotedTweet)) {
+      const quotedTweet = normalizeItem(item.quotedTweet, true);
+      if (quotedTweet.id !== item.id) {
+        includedTweets.set(quotedTweet.id, quotedTweet);
+      }
+    }
     return {
       id: item.id,
       author_id: authorId,
@@ -6218,17 +6504,29 @@ function normalizeBirdTweets(items) {
       conversation_id: item.conversationId ?? item.id,
       entities: toTweetEntities(item),
       referenced_tweets: toReferencedTweets(item),
-      public_metrics: {
+      public_metrics: preserveMissingMetrics ? {
+        ...item.replyCount === void 0 ? {} : { reply_count: Number(item.replyCount) },
+        ...item.retweetCount === void 0 ? {} : { retweet_count: Number(item.retweetCount) },
+        ...item.likeCount === void 0 ? {} : { like_count: Number(item.likeCount) }
+      } : {
         reply_count: Number(item.replyCount ?? 0),
         retweet_count: Number(item.retweetCount ?? 0),
         like_count: Number(item.likeCount ?? 0)
       },
       edit_history_tweet_ids: [item.id]
     };
-  });
+  };
+  const data = items.map((item) => normalizeItem(item));
+  const includes = {};
+  if (users.size > 0) {
+    includes.users = Array.from(users.values());
+  }
+  if (includedTweets.size > 0) {
+    includes.tweets = Array.from(includedTweets.values());
+  }
   return {
     data,
-    includes: users.size > 0 ? { users: Array.from(users.values()) } : void 0,
+    includes: users.size > 0 || includedTweets.size > 0 ? includes : void 0,
     meta: {
       result_count: data.length,
       page_count: 1,
@@ -6260,11 +6558,10 @@ function listMentionsViaBirdEffect({
   maxResults
 }) {
   return Effect8.gen(function* () {
-    const stdout = yield* runBirdJsonCommandEffect([
+    const stdout = yield* runBirdTweetJsonCommandEffect([
       "mentions",
       "-n",
-      String(maxResults),
-      "--json"
+      String(maxResults)
     ]);
     const payload = yield* parseBirdJsonEffect(stdout);
     return yield* normalizeBirdTweetsPayloadEffect(payload, "mentions");
@@ -6277,14 +6574,14 @@ function listTweetsViaBirdCommandEffect({
   maxPages
 }) {
   return Effect8.gen(function* () {
-    const args = [command, "-n", String(maxResults), "--json"];
+    const args = [command, "-n", String(maxResults)];
     if (all) {
       args.push("--all");
+      if (maxPages !== void 0) {
+        args.push("--max-pages", String(maxPages));
+      }
     }
-    if (maxPages !== void 0) {
-      args.push("--max-pages", String(maxPages));
-    }
-    const stdout = yield* runBirdJsonCommandEffect(args);
+    const stdout = yield* runBirdTweetJsonCommandEffect(args);
     const payload = yield* parseBirdJsonEffect(stdout);
     return yield* normalizeBirdTweetsPayloadEffect(payload, command);
   });
@@ -6303,14 +6600,14 @@ function listBookmarkedTweetsViaBirdEffect(options) {
 }
 function searchTweetsViaBirdEffect(query, options) {
   return Effect8.gen(function* () {
-    const args = ["search", query, "-n", String(options.maxResults), "--json"];
+    const args = ["search", query, "-n", String(options.maxResults)];
     if (options.all) {
       args.push("--all");
     }
     if (options.all && options.maxPages !== void 0) {
       args.push("--max-pages", String(options.maxPages));
     }
-    const stdout = yield* runBirdJsonCommandEffect(args);
+    const stdout = yield* runBirdTweetJsonCommandEffect(args);
     const payload = yield* parseBirdJsonEffect(stdout);
     return yield* normalizeBirdTweetsPayloadEffect(payload, "search");
   });
@@ -6323,11 +6620,7 @@ function lookupTweetsByIdsViaBirdEffect(ids) {
     const tweets = yield* Effect8.forEach(
       ids,
       (id) => Effect8.gen(function* () {
-        const stdout = yield* runBirdJsonCommandEffect([
-          "read",
-          id,
-          "--json"
-        ]);
+        const stdout = yield* runBirdTweetJsonCommandEffect(["read", id]);
         const payload = yield* parseBirdJsonEffect(stdout);
         return yield* normalizeBirdTweetItemEffect(payload, "read");
       }),
@@ -6341,11 +6634,11 @@ function listHomeTimelineViaBirdEffect({
   following = true
 }) {
   return Effect8.gen(function* () {
-    const args = ["home", "-n", String(maxResults), "--json"];
+    const args = ["home", "-n", String(maxResults)];
     if (following) {
       args.push("--following");
     }
-    const stdout = yield* runBirdJsonCommandEffect(args);
+    const stdout = yield* runBirdTweetJsonCommandEffect(args);
     const payload = yield* parseBirdJsonEffect(stdout);
     return yield* normalizeBirdTweetsPayloadEffect(payload, "home");
   });
@@ -6358,12 +6651,14 @@ function normalizeBirdFollowUsers(payload, command, maxResults) {
   }
   const data = users.map(toXurlMentionUser).filter((user) => Boolean(user));
   const nextToken = !Array.isArray(rawPayload) && typeof rawPayload.nextCursor === "string" ? rawPayload.nextCursor : null;
+  const paginationKnownComplete = Array.isArray(rawPayload) ? data.length < maxResults : nextToken === null;
   return {
     data,
     meta: {
       result_count: data.length,
       page_count: data.length > 0 ? Math.max(1, Math.ceil(data.length / maxResults)) : 1,
-      next_token: nextToken
+      next_token: nextToken,
+      pagination_known_complete: paginationKnownComplete
     }
   };
 }
@@ -6400,6 +6695,73 @@ function listFollowUsersViaBirdEffect({
     );
   });
 }
+function normalizeBirdLists(payload) {
+  if (!Array.isArray(payload)) {
+    throw new Error("bird lists returned unexpected JSON");
+  }
+  const data = payload.map((value) => {
+    const item = value;
+    if (!item.id || !item.name) return null;
+    return {
+      id: item.id,
+      name: item.name,
+      ...item.description ? { description: item.description } : {},
+      ...typeof item.memberCount === "number" ? { memberCount: item.memberCount } : {},
+      ...typeof item.subscriberCount === "number" ? { followerCount: item.subscriberCount } : {},
+      ...typeof item.isPrivate === "boolean" ? { isPrivate: item.isPrivate } : {},
+      ...item.owner?.id ? { ownerId: item.owner.id } : {},
+      ...item.owner?.username ? { ownerUsername: item.owner.username } : {},
+      ...item.owner?.name ? { ownerName: item.owner.name } : {},
+      ...item.createdAt ? { createdAt: item.createdAt } : {},
+      raw: value
+    };
+  }).filter((item) => Boolean(item));
+  return { data, meta: { result_count: data.length, next_token: null } };
+}
+function listOwnedXListsViaBirdEffect({
+  maxResults
+}) {
+  return Effect8.gen(function* () {
+    const stdout = yield* runBirdJsonCommandEffect([
+      "lists",
+      "-n",
+      String(maxResults),
+      "--json"
+    ]);
+    const payload = yield* parseBirdJsonEffect(stdout);
+    return yield* Effect8.try({
+      try: () => normalizeBirdLists(payload),
+      catch: (error) => error
+    });
+  });
+}
+function listXListMembersViaBirdEffect({
+  listId,
+  maxResults,
+  maxPages = 1
+}) {
+  return Effect8.gen(function* () {
+    const args = ["list-members", listId, "-n", String(maxResults), "--json"];
+    if (maxPages > 1) {
+      args.push("--all", "--max-pages", String(maxPages));
+    }
+    const stdout = yield* runBirdJsonCommandEffect(args);
+    const payload = yield* parseBirdJsonEffect(stdout);
+    const normalized = yield* normalizeBirdFollowUsersEffect(
+      payload,
+      "list-members",
+      maxResults
+    );
+    if (Array.isArray(payload)) {
+      normalized.meta = {
+        ...normalized.meta,
+        pagination_known_complete: false,
+        pagination_inferred_complete: normalized.data.length < maxResults
+      };
+    }
+    return normalized;
+  });
+}
 function listThreadViaBirdEffect({
   tweetId,
   all,
@@ -6407,14 +6769,14 @@ function listThreadViaBirdEffect({
   timeoutMs
 }) {
   return Effect8.gen(function* () {
-    const args = ["thread", tweetId, "--json"];
+    const args = ["thread", tweetId];
     if (all) {
       args.push("--all");
     }
     if (maxPages !== void 0) {
       args.push("--max-pages", String(maxPages));
     }
-    const stdout = yield* runBirdJsonCommandEffect(args, timeoutMs);
+    const stdout = yield* runBirdTweetJsonCommandEffect(args, timeoutMs);
     const payload = yield* parseBirdJsonEffect(stdout);
     return yield* normalizeBirdTweetsPayloadEffect(payload, "thread");
   });
@@ -7104,6 +7466,71 @@ function lookupUsersByIdsEffect(ids) {
 function lookupUsersByIds(ids) {
   return runEffectPromise(lookupUsersByIdsEffect(ids));
 }
+function normalizeXListPage(payload) {
+  const rawItems = Array.isArray(payload.data) ? payload.data : [];
+  const data = rawItems.map((value) => {
+    const item = value;
+    if (typeof item.id !== "string" || typeof item.name !== "string") {
+      return null;
+    }
+    return {
+      id: item.id,
+      name: item.name,
+      ...typeof item.description === "string" ? { description: item.description } : {},
+      ...typeof item.member_count === "number" ? { memberCount: item.member_count } : {},
+      ...typeof item.follower_count === "number" ? { followerCount: item.follower_count } : {},
+      ...typeof item.private === "boolean" ? { isPrivate: item.private } : {},
+      ...typeof item.owner_id === "string" ? { ownerId: item.owner_id } : {},
+      ...typeof item.created_at === "string" ? { createdAt: item.created_at } : {},
+      raw: item
+    };
+  }).filter((item) => Boolean(item));
+  const meta = payload.meta && typeof payload.meta === "object" ? payload.meta : {};
+  return {
+    data,
+    meta: {
+      result_count: data.length,
+      ...typeof meta.next_token === "string" ? { next_token: meta.next_token } : { next_token: null }
+    }
+  };
+}
+function listOwnedXListsViaXurlEffect({
+  userId,
+  username,
+  maxResults,
+  paginationToken
+}) {
+  const query = new URLSearchParams({
+    max_results: String(maxResults),
+    "list.fields": "created_at,description,follower_count,member_count,name,owner_id,private"
+  });
+  if (paginationToken) query.set("pagination_token", paginationToken);
+  return runOAuth2JsonCommandEffect({
+    args: [`/2/users/${userId}/owned_lists?${query.toString()}`],
+    username
+  }).pipe(Effect9.map(normalizeXListPage));
+}
+function listXListMembersViaXurlEffect({
+  listId,
+  username,
+  maxResults,
+  paginationToken
+}) {
+  const query = new URLSearchParams({
+    max_results: String(maxResults),
+    "user.fields": RICH_USER_FIELDS
+  });
+  if (paginationToken) query.set("pagination_token", paginationToken);
+  return runOAuth2JsonCommandEffect({
+    args: [`/2/lists/${listId}/members?${query.toString()}`],
+    username
+  }).pipe(
+    Effect9.map((payload) => ({
+      data: Array.isArray(payload.data) ? payload.data : [],
+      meta: payload.meta && typeof payload.meta === "object" ? payload.meta : {}
+    }))
+  );
+}
 function lookupUsersByHandlesEffect(handles, options = {}) {
   if (handles.length === 0) {
     return Effect9.succeed([]);
@@ -8218,16 +8645,15 @@ function enrichFallbackUrlEntities(text, entities, resolveExpansion) {
   const existingUrls = entities.urls ?? [];
   const enrichedExistingUrls = existingUrls.map((entry) => {
     const expansion = resolveExpansion?.(entry.url);
-    if (!expansion) return entry;
-    const expandedUrl = expansion.expandedUrl || entry.expandedUrl;
+    const expandedUrl = expansion?.expandedUrl || entry.expandedUrl || entry.url;
     return {
       ...entry,
       expandedUrl,
-      displayUrl: expansion.displayUrl || displayUrlForLink(expandedUrl),
-      ...expansion.title ? { title: expansion.title } : {},
+      displayUrl: expansion?.displayUrl || entry.displayUrl || displayUrlForLink(expandedUrl),
+      ...expansion?.title ? { title: expansion.title } : {},
       ...expansion && "description" in expansion ? { description: expansion.description ?? null } : {},
-      ...expansion.imageUrl ? { imageUrl: expansion.imageUrl } : {},
-      ...expansion.siteName ? { siteName: expansion.siteName } : {}
+      ...expansion?.imageUrl ? { imageUrl: expansion.imageUrl } : {},
+      ...expansion?.siteName ? { siteName: expansion.siteName } : {}
     };
   });
   const fallbackUrls = [];
@@ -9661,6 +10087,16 @@ function ensureStubProfileForXUser(db, externalUserId) {
 function getReferencedTweetId(tweet, type) {
   return tweet.referenced_tweets?.find((item) => item.type === type)?.id ?? null;
 }
+function toCanonicalTweets(payload) {
+  const tweetsById = /* @__PURE__ */ new Map();
+  for (const tweet of payload.includes?.tweets ?? []) {
+    tweetsById.set(tweet.id, tweet);
+  }
+  for (const tweet of payload.data) {
+    tweetsById.set(tweet.id, tweet);
+  }
+  return tweetsById.values();
+}
 function replaceTweetFts(db, tweetId, text) {
   db.prepare("delete from tweets_fts where tweet_id = ?").run(tweetId);
   db.prepare("insert into tweets_fts (tweet_id, text) values (?, ?)").run(
@@ -9690,7 +10126,7 @@ function ingestTweetPayload(db, {
       created_at = excluded.created_at,
       is_replied = max(tweets.is_replied, excluded.is_replied),
       reply_to_id = coalesce(tweets.reply_to_id, excluded.reply_to_id),
-      like_count = excluded.like_count,
+      like_count = case when ? then tweets.like_count else excluded.like_count end,
       media_count = max(tweets.media_count, excluded.media_count),
       entities_json = excluded.entities_json,
       media_json = case
@@ -9711,25 +10147,29 @@ function ingestTweetPayload(db, {
   const tweetIds = [];
   db.transaction(() => {
     const observedAt = (/* @__PURE__ */ new Date()).toISOString();
-    for (const tweet of payload.data) {
+    const primaryTweetIds = new Set(payload.data.map((tweet) => tweet.id));
+    for (const tweet of toCanonicalTweets(payload)) {
+      const isPrimaryTweet = primaryTweetIds.has(tweet.id);
       const author = usersById.get(tweet.author_id);
       const profile = author ? upsertProfileFromXUser(db, author) : ensureStubProfileForXUser(db, tweet.author_id);
       const replyToId = getReferencedTweetId(tweet, "replied_to");
       const quotedTweetId = getReferencedTweetId(tweet, "quoted");
+      const shouldMarkReplied = isPrimaryTweet && markRepliesAsReplied && Boolean(replyToId);
       upsertTweet.run(
         tweet.id,
         profile.profile.id,
         tweet.text,
         tweet.created_at,
-        markRepliesAsReplied && replyToId ? 1 : 0,
+        shouldMarkReplied ? 1 : 0,
         replyToId,
         Number(tweet.public_metrics?.like_count ?? 0),
         countTweetMedia(tweet),
         JSON.stringify(tweetEntitiesFromXurl(tweet.entities)),
         buildMediaJsonFromIncludes(tweet, payload.includes?.media),
-        quotedTweetId
+        quotedTweetId,
+        !isPrimaryTweet && tweet.public_metrics?.like_count === void 0 ? 1 : 0
       );
-      if (edgeKind) {
+      if (edgeKind && isPrimaryTweet) {
         upsertTweetAccountEdge(db, {
           accountId,
           tweetId: tweet.id,
@@ -9739,16 +10179,20 @@ function ingestTweetPayload(db, {
           rawJson: JSON.stringify(tweet)
         });
       }
-      upsertCollection?.run(
-        accountId,
-        tweet.id,
-        collectionKind2,
-        source,
-        JSON.stringify(tweet),
-        observedAt
-      );
+      if (isPrimaryTweet) {
+        upsertCollection?.run(
+          accountId,
+          tweet.id,
+          collectionKind2,
+          source,
+          JSON.stringify(tweet),
+          observedAt
+        );
+      }
       replaceTweetFts(db, tweet.id, tweet.text);
-      tweetIds.push(tweet.id);
+      if (isPrimaryTweet) {
+        tweetIds.push(tweet.id);
+      }
     }
   })();
   return tweetIds;
@@ -10720,6 +11164,8 @@ var RECENT_TIMELINE_EDGE_CANDIDATES = 5e3;
 function listTimelineItems({
   resource,
   account,
+  listAccountId,
+  listId,
   search,
   replyFilter = "all",
   since,
@@ -10750,14 +11196,14 @@ function listTimelineItems({
   let join3 = "";
   let where = "where e.kind = ?";
   let searchSnippetSelect = "";
-  const canUseRecentEdgeWindow = !likedOnly && !bookmarkedOnly && !account && !search?.trim() && replyFilter === "all" && !since?.trim() && !until?.trim() && includeReplies && qualityFilter === "all";
+  const canUseRecentEdgeWindow = !likedOnly && !bookmarkedOnly && !listId && !account && !search?.trim() && replyFilter === "all" && !since?.trim() && !until?.trim() && includeReplies && qualityFilter === "all";
   if (likedOnly || bookmarkedOnly) {
     if (likedOnly && bookmarkedOnly) {
       timelineEdgesCte = `
         with timeline_edges as (
           select likes.account_id, likes.tweet_id, 'home' as kind, likes.raw_json
-          from tweet_collections likes
-	          join tweet_collections bookmarks
+	          from tweet_collections likes indexed by idx_tweet_collections_tweet
+	          join tweet_collections bookmarks indexed by idx_tweet_collections_tweet
             on bookmarks.account_id = likes.account_id
             and bookmarks.tweet_id = likes.tweet_id
 	            and bookmarks.kind = 'bookmarks'
@@ -10769,7 +11215,7 @@ function listTimelineItems({
       timelineEdgesCte = `
 	        with timeline_edges as (
 	          select account_id, tweet_id, 'home' as kind, raw_json
-	          from tweet_collections
+	          from tweet_collections indexed by idx_tweet_collections_tweet
 	          where kind = ?
 	        )
 				`;
@@ -10846,6 +11292,22 @@ function listTimelineItems({
       params.push(until.trim());
     }
   }
+  if (Boolean(listId) !== Boolean(listAccountId)) {
+    throw new Error("List filtering requires both listId and listAccountId");
+  }
+  if (listId && listAccountId) {
+    where += `
+      and exists (
+        select 1
+        from x_list_members list_member
+        where list_member.account_id = ?
+          and list_member.list_id = ?
+          and list_member.profile_id = t.author_profile_id
+          and list_member.current = 1
+      )
+    `;
+    params.push(listAccountId, listId);
+  }
   const ftsSearch = search?.trim() ? toFtsSearchQuery(search) : "";
   if (ftsSearch) {
     join3 += " join tweets_fts on tweets_fts.tweet_id = t.id ";
@@ -12519,6 +12981,7 @@ function reachedStartTimeBoundary(payload, startTimeMs) {
 function mergeTimelinePayloads(payloads, limit) {
   const data = [];
   const usersById = /* @__PURE__ */ new Map();
+  const tweetsById = /* @__PURE__ */ new Map();
   const mediaByKey = /* @__PURE__ */ new Map();
   let meta;
   for (const payload of payloads) {
@@ -12531,6 +12994,9 @@ function mergeTimelinePayloads(payloads, limit) {
     for (const user of payload.includes?.users ?? []) {
       usersById.set(user.id, user);
     }
+    for (const tweet of payload.includes?.tweets ?? []) {
+      tweetsById.set(tweet.id, tweet);
+    }
     for (const media of payload.includes?.media ?? []) {
       mediaByKey.set(media.media_key, media);
     }
@@ -12540,6 +13006,7 @@ function mergeTimelinePayloads(payloads, limit) {
     data,
     includes: {
       users: [...usersById.values()],
+      tweets: [...tweetsById.values()],
       media: [...mediaByKey.values()]
     },
     meta
@@ -12848,6 +13315,7 @@ function compactTweet(source, item) {
     createdAt: item.createdAt,
     text: item.text,
     entities: item.entities,
+    media: item.media,
     likeCount: item.likeCount,
     liked: item.liked,
     bookmarked: item.bookmarked,
@@ -12867,6 +13335,7 @@ function compactEmbeddedTweet(item) {
     createdAt: item.createdAt,
     text: item.text,
     entities: item.entities,
+    media: item.media,
     likeCount: item.likeCount ?? 0,
     liked: Boolean(item.liked),
     bookmarked: Boolean(item.bookmarked),
@@ -15391,6 +15860,8 @@ function compactTweet2(source, item) {
     authorProfile: item.author,
     createdAt: item.createdAt,
     text: item.text,
+    entities: item.entities,
+    media: item.media,
     likeCount: item.likeCount,
     liked: item.liked,
     bookmarked: item.bookmarked,
@@ -15428,7 +15899,9 @@ function collectLiveSearchTweets(options) {
         t.created_at,
         t.is_replied,
         t.like_count,
-        t.media_count,
+			t.media_count,
+			t.entities_json,
+			t.media_json,
         case
           when exists (
             select 1 from tweet_collections collection
@@ -15482,6 +15955,8 @@ function collectLiveSearchTweets(options) {
       },
       createdAt: String(row.created_at),
       text: String(row.text),
+      entities: parseJsonField2(row.entities_json, {}),
+      media: parseJsonField2(row.media_json, []),
       likeCount: Number(row.like_count),
       liked: Boolean(row.liked),
       bookmarked: Boolean(row.bookmarked),
@@ -23372,19 +23847,550 @@ function registerJobCommands({ program: program2, print: print2 }) {
   });
 }
 
+// src/lib/x-lists.ts
+import { Effect as Effect47 } from "effect";
+var DEFAULT_MAX_LISTS = 20;
+var DEFAULT_MEMBER_LIMIT = 20;
+var DEFAULT_MAX_MEMBER_PAGES = 1;
+var DEFAULT_DELAY_MS2 = 1e3;
+var MAX_LISTS = 100;
+var MAX_MEMBER_LIMIT = 100;
+var MAX_MEMBER_PAGES = 100;
+function positiveInteger(name, value, maximum) {
+  if (!Number.isFinite(value) || value < 1 || value > maximum) {
+    throw new Error(`${name} must be between 1 and ${String(maximum)}`);
+  }
+  return Math.floor(value);
+}
+function nonNegativeInteger(name, value) {
+  if (!Number.isFinite(value) || value < 0) {
+    throw new Error(`${name} must be a non-negative integer`);
+  }
+  return Math.floor(value);
+}
+function normalizedMode(value) {
+  if (value === void 0) return "auto";
+  if (value === "auto" || value === "bird" || value === "xurl") return value;
+  throw new Error("--mode must be auto, bird, or xurl");
+}
+function metaString(meta, key) {
+  const value = meta?.[key];
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function metaNumber(meta, key) {
+  const value = meta?.[key];
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function parseJsonRecord(value) {
+  if (typeof value !== "string" || value.length === 0) return {};
+  try {
+    const parsed = JSON.parse(value);
+    return parsed && typeof parsed === "object" ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function fetchOwnedListsEffect({
+  source,
+  account,
+  maxLists
+}) {
+  if (source === "bird") {
+    return Effect47.gen(function* () {
+      const authenticated = yield* getAuthenticatedBirdAccountEffect();
+      yield* trySync(
+        () => assertLiveAccountMatches({
+          source: "bird",
+          account,
+          liveUsername: authenticated.username,
+          liveExternalUserId: authenticated.id
+        })
+      );
+      return yield* listOwnedXListsViaBirdEffect({ maxResults: maxLists });
+    });
+  }
+  return Effect47.gen(function* () {
+    const authenticated = yield* lookupAuthenticatedOAuth2UserEffect(
+      account.username
+    );
+    if (!authenticated) {
+      return yield* Effect47.fail(
+        new Error("xurl did not return an OAuth2 user")
+      );
+    }
+    const liveUsername = String(authenticated.username ?? "");
+    const liveExternalUserId = String(authenticated.id ?? "");
+    yield* trySync(
+      () => assertLiveAccountMatches({
+        source: "xurl",
+        account,
+        liveUsername,
+        liveExternalUserId
+      })
+    );
+    const userId = account.externalUserId ?? liveExternalUserId;
+    if (!userId) {
+      return yield* Effect47.fail(
+        new Error("xurl authenticated user is missing an id")
+      );
+    }
+    return yield* listOwnedXListsViaXurlEffect({
+      userId,
+      username: account.username,
+      maxResults: maxLists
+    });
+  });
+}
+function fetchListMembersEffect({
+  source,
+  list,
+  username,
+  memberLimit,
+  maxMemberPages
+}) {
+  if (source === "bird") {
+    return listXListMembersViaBirdEffect({
+      listId: list.id,
+      maxResults: memberLimit,
+      maxPages: maxMemberPages
+    });
+  }
+  return Effect47.gen(function* () {
+    const data = [];
+    const seen = /* @__PURE__ */ new Set();
+    let paginationToken;
+    let pageCount = 0;
+    do {
+      const page = yield* listXListMembersViaXurlEffect({
+        listId: list.id,
+        username,
+        maxResults: memberLimit,
+        paginationToken
+      });
+      pageCount += 1;
+      for (const user of page.data) {
+        if (seen.has(user.id)) continue;
+        seen.add(user.id);
+        data.push(user);
+      }
+      paginationToken = metaString(page.meta, "next_token");
+    } while (paginationToken && pageCount < maxMemberPages);
+    return {
+      data,
+      meta: {
+        result_count: data.length,
+        page_count: pageCount,
+        next_token: paginationToken ?? null,
+        pagination_known_complete: !paginationToken
+      }
+    };
+  });
+}
+function membershipStatus({
+  list,
+  payload
+}) {
+  if (payload.meta?.pagination_known_complete === true) return "complete";
+  if (payload.meta?.pagination_inferred_complete === true) return "inferred";
+  if (typeof list.memberCount === "number" && payload.data.length >= list.memberCount) {
+    return "inferred";
+  }
+  return "partial";
+}
+function ownerProfileId(db, list) {
+  if (!list.ownerId || !list.ownerUsername) return void 0;
+  return upsertProfileFromXUser(db, {
+    id: list.ownerId,
+    username: list.ownerUsername,
+    name: list.ownerName ?? list.ownerUsername
+  }).profile.id;
+}
+function persistListResult({
+  db,
+  accountId,
+  list,
+  source,
+  payload,
+  status,
+  now: now2,
+  rateLimit
+}) {
+  return db.transaction(() => {
+    const listOwnerProfileId = ownerProfileId(db, list);
+    const membersSyncedAt = payload ? now2 : null;
+    const pageCount = payload ? metaNumber(payload.meta, "page_count") ?? 1 : 0;
+    const resultCount = payload?.data.length ?? 0;
+    db.prepare(
+      `
+      insert into x_lists (
+        account_id, list_id, name, description, owner_profile_id,
+        owner_external_user_id, is_private, member_count, follower_count,
+        source, membership_status, lists_synced_at, members_synced_at,
+        member_page_count, member_result_count, rate_limit_json, raw_json,
+        updated_at
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      on conflict(account_id, list_id) do update set
+        name = excluded.name,
+        description = excluded.description,
+        owner_profile_id = coalesce(excluded.owner_profile_id, x_lists.owner_profile_id),
+        owner_external_user_id = coalesce(excluded.owner_external_user_id, x_lists.owner_external_user_id),
+        is_private = excluded.is_private,
+        member_count = coalesce(excluded.member_count, x_lists.member_count),
+        follower_count = coalesce(excluded.follower_count, x_lists.follower_count),
+        source = excluded.source,
+        membership_status = excluded.membership_status,
+        lists_synced_at = excluded.lists_synced_at,
+        members_synced_at = coalesce(excluded.members_synced_at, x_lists.members_synced_at),
+        member_page_count = excluded.member_page_count,
+        member_result_count = excluded.member_result_count,
+        rate_limit_json = excluded.rate_limit_json,
+        raw_json = excluded.raw_json,
+        updated_at = excluded.updated_at
+      `
+    ).run(
+      accountId,
+      list.id,
+      list.name,
+      list.description ?? "",
+      listOwnerProfileId ?? null,
+      list.ownerId ?? null,
+      list.isPrivate ? 1 : 0,
+      list.memberCount ?? null,
+      list.followerCount ?? null,
+      source,
+      status,
+      now2,
+      membersSyncedAt,
+      pageCount,
+      resultCount,
+      JSON.stringify(rateLimit),
+      JSON.stringify(list.raw ?? {}),
+      now2
+    );
+    if (!payload) return;
+    if (status === "complete") {
+      db.prepare(
+        `
+        update x_list_members
+        set current = 0, ended_at = ?, updated_at = ?
+        where account_id = ? and list_id = ? and current = 1
+        `
+      ).run(now2, now2, accountId, list.id);
+    }
+    const upsertMember = db.prepare(`
+      insert into x_list_members (
+        account_id, list_id, profile_id, external_user_id, source, current,
+        first_seen_at, last_seen_at, ended_at, raw_json, updated_at
+      ) values (?, ?, ?, ?, ?, 1, ?, ?, null, ?, ?)
+      on conflict(account_id, list_id, profile_id) do update set
+        external_user_id = excluded.external_user_id,
+        source = excluded.source,
+        current = 1,
+        last_seen_at = excluded.last_seen_at,
+        ended_at = null,
+        raw_json = excluded.raw_json,
+        updated_at = excluded.updated_at
+    `);
+    for (const user of payload.data) {
+      const resolved = upsertProfileFromXUser(db, user);
+      upsertMember.run(
+        accountId,
+        list.id,
+        resolved.profile.id,
+        resolved.externalUserId,
+        source,
+        now2,
+        now2,
+        JSON.stringify(user),
+        now2
+      );
+    }
+  })();
+}
+function syncXListsEffect(options = {}) {
+  return Effect47.suspend(() => {
+    const mode = normalizedMode(options.mode);
+    const maxLists = positiveInteger(
+      "--max-lists",
+      options.maxLists ?? DEFAULT_MAX_LISTS,
+      MAX_LISTS
+    );
+    const memberLimit = positiveInteger(
+      "--member-limit",
+      options.memberLimit ?? DEFAULT_MEMBER_LIMIT,
+      MAX_MEMBER_LIMIT
+    );
+    const maxMemberPages = positiveInteger(
+      "--max-member-pages",
+      options.maxMemberPages ?? DEFAULT_MAX_MEMBER_PAGES,
+      MAX_MEMBER_PAGES
+    );
+    const delayMs = nonNegativeInteger(
+      "--delay-ms",
+      options.delayMs ?? DEFAULT_DELAY_MS2
+    );
+    const db = getNativeDb();
+    const account = resolveLiveSyncAccount(db, options.account);
+    const sources = mode === "auto" ? ["bird", "xurl"] : [mode];
+    const transports = sources.map(
+      (source) => createLiveTransportAdapter(
+        source,
+        fetchOwnedListsEffect({ source, account, maxLists })
+      )
+    );
+    return Effect47.gen(function* () {
+      const discovered = yield* fetchWithTransportFallbackEffect(transports);
+      const source = discovered.source;
+      const lists = discovered.payload.data.slice(0, maxLists);
+      const results = [];
+      for (const [index, list] of lists.entries()) {
+        if (index > 0 && delayMs > 0) yield* Effect47.sleep(delayMs);
+        const fetched = yield* fetchListMembersEffect({
+          source,
+          list,
+          username: account.username,
+          memberLimit,
+          maxMemberPages
+        }).pipe(
+          Effect47.map((payload) => ({ ok: true, payload })),
+          Effect47.catchAll(
+            (error) => Effect47.succeed({ ok: false, error: toError(error) })
+          )
+        );
+        const now2 = (/* @__PURE__ */ new Date()).toISOString();
+        const rateLimit = {
+          memberLimit,
+          maxMemberPages,
+          delayMs,
+          nextCursorStored: fetched.ok ? Boolean(metaString(fetched.payload.meta, "next_token")) : false
+        };
+        if (!fetched.ok) {
+          yield* databaseWriteEffect(
+            (writeDb) => persistListResult({
+              db: writeDb,
+              accountId: account.accountId,
+              list,
+              source,
+              status: "error",
+              now: now2,
+              rateLimit
+            })
+          );
+          results.push({
+            listId: list.id,
+            name: list.name,
+            status: "error",
+            error: fetched.error.message
+          });
+          continue;
+        }
+        const status = membershipStatus({ list, payload: fetched.payload });
+        yield* databaseWriteEffect(
+          (writeDb) => persistListResult({
+            db: writeDb,
+            accountId: account.accountId,
+            list,
+            source,
+            payload: fetched.payload,
+            status,
+            now: now2,
+            rateLimit
+          })
+        );
+        results.push({
+          listId: list.id,
+          name: list.name,
+          status,
+          members: fetched.payload.data.length,
+          pages: metaNumber(fetched.payload.meta, "page_count") ?? 1
+        });
+      }
+      const errors = results.filter((result) => result.status === "error");
+      return {
+        ok: errors.length === 0,
+        accountId: account.accountId,
+        mode,
+        source,
+        listCount: lists.length,
+        membershipCompleteCount: results.filter(
+          (result) => result.status === "complete"
+        ).length,
+        membershipPartialCount: results.filter(
+          (result) => result.status === "partial"
+        ).length,
+        membershipInferredCount: results.filter(
+          (result) => result.status === "inferred"
+        ).length,
+        errorCount: errors.length,
+        rateLimit: { maxLists, memberLimit, maxMemberPages, delayMs },
+        lists: results
+      };
+    });
+  });
+}
+function syncXLists(options = {}) {
+  return runEffectPromise(syncXListsEffect(options));
+}
+function accountIdForRead(db, account) {
+  return resolveLiveSyncAccount(db, account).accountId;
+}
+function storedListFromRow(row) {
+  return {
+    accountId: String(row.account_id),
+    listId: String(row.list_id),
+    name: String(row.name),
+    description: String(row.description ?? ""),
+    ...row.owner_profile_id ? { ownerProfileId: String(row.owner_profile_id) } : {},
+    ...row.owner_external_user_id ? { ownerExternalUserId: String(row.owner_external_user_id) } : {},
+    isPrivate: Number(row.is_private) === 1,
+    ...typeof row.member_count === "number" ? { memberCount: row.member_count } : {},
+    ...typeof row.follower_count === "number" ? { followerCount: row.follower_count } : {},
+    source: String(row.source),
+    membershipStatus: String(row.membership_status),
+    listsSyncedAt: String(row.lists_synced_at),
+    ...row.members_synced_at ? { membersSyncedAt: String(row.members_synced_at) } : {},
+    memberPageCount: Number(row.member_page_count),
+    memberResultCount: Number(row.member_result_count),
+    rateLimit: parseJsonRecord(row.rate_limit_json)
+  };
+}
+function listStoredXLists(options = {}) {
+  const db = getReadDb();
+  const accountId = accountIdForRead(db, options.account);
+  return db.prepare(
+    `select * from x_lists where account_id = ? order by name collate nocase, list_id`
+  ).all(accountId).map(storedListFromRow);
+}
+function resolveStoredXListSelector({
+  account,
+  listId,
+  name
+}) {
+  if (Boolean(listId) === Boolean(name)) {
+    throw new Error("Choose exactly one of --list or --list-id");
+  }
+  const db = getReadDb();
+  const accountId = accountIdForRead(db, account);
+  const rows = listId ? db.prepare("select * from x_lists where account_id = ? and list_id = ?").all(accountId, listId) : db.prepare(
+    "select * from x_lists where account_id = ? and name = ? collate nocase order by list_id"
+  ).all(accountId, name);
+  if (rows.length === 0) {
+    throw new Error(
+      `No cached List matches ${listId ? `id ${listId}` : `name ${name}`}; run birdclaw sync lists`
+    );
+  }
+  if (rows.length > 1) {
+    throw new Error(
+      `List name ${name} is ambiguous; use --list-id (${rows.map((row) => String(row.list_id)).join(", ")})`
+    );
+  }
+  return storedListFromRow(rows[0]);
+}
+function listStoredXListMembers({
+  account,
+  listId,
+  name,
+  includeEnded = false,
+  limit = 100
+}) {
+  const list = resolveStoredXListSelector({ account, listId, name });
+  const db = getReadDb();
+  const rows = db.prepare(
+    `
+      select
+        member.account_id, member.list_id, member.external_user_id,
+        member.current, member.first_seen_at, member.last_seen_at,
+        member.ended_at, profile.id as profile_id, profile.handle,
+        profile.display_name, profile.bio, profile.followers_count,
+        profile.avatar_url
+      from x_list_members member
+      join profiles profile on profile.id = member.profile_id
+      where member.account_id = ? and member.list_id = ?
+        and (? = 1 or member.current = 1)
+      order by profile.followers_count desc, profile.handle collate nocase
+      limit ?
+      `
+  ).all(
+    list.accountId,
+    list.listId,
+    includeEnded ? 1 : 0,
+    positiveInteger("--limit", limit, 1e4)
+  );
+  const items = rows.map((row) => ({
+    accountId: String(row.account_id),
+    listId: String(row.list_id),
+    externalUserId: String(row.external_user_id),
+    current: Number(row.current) === 1,
+    firstSeenAt: String(row.first_seen_at),
+    lastSeenAt: String(row.last_seen_at),
+    ...row.ended_at ? { endedAt: String(row.ended_at) } : {},
+    profile: {
+      id: String(row.profile_id),
+      handle: String(row.handle),
+      displayName: String(row.display_name),
+      bio: String(row.bio),
+      followersCount: Number(row.followers_count),
+      ...row.avatar_url ? { avatarUrl: String(row.avatar_url) } : {}
+    }
+  }));
+  return { list, items };
+}
+
+// src/cli/register-lists.ts
+function registerListCommands({
+  program: program2,
+  print: print2,
+  asJson,
+  autoUpdateBeforeRead: autoUpdateBeforeRead2
+}) {
+  const listsCommand = program2.command("lists").description("Inspect cached X Lists and membership");
+  listsCommand.command("list").description("List cached owned X Lists").option("--account <accountId>", "Account id").action(async (options) => {
+    await autoUpdateBeforeRead2();
+    const items = listStoredXLists({ account: options.account });
+    if (asJson()) {
+      print2(items, true);
+      return;
+    }
+    console.log(
+      items.map(
+        (item) => `${item.name}	${item.listId}	${item.membershipStatus}	${String(item.memberResultCount)}/${item.memberCount === void 0 ? "?" : String(item.memberCount)}`
+      ).join("\n")
+    );
+  });
+  listsCommand.command("members [name]").description("List cached members for one X List").option("--list-id <id>", "Select by List id").option("--account <accountId>", "Account id").option("--include-ended", "Include members absent from a complete sync").option("--limit <n>", "Limit results", "100").action(async (name, options) => {
+    await autoUpdateBeforeRead2();
+    const result = listStoredXListMembers({
+      account: options.account,
+      name,
+      listId: options.listId,
+      includeEnded: Boolean(options.includeEnded),
+      limit: Number(options.limit)
+    });
+    if (asJson()) {
+      print2(result, true);
+      return;
+    }
+    console.log(
+      result.items.map(
+        (item) => `@${item.profile.handle}	${item.externalUserId}	${item.current ? "current" : "ended"}`
+      ).join("\n")
+    );
+  });
+}
+
 // src/lib/profile-replies.ts
-import { Effect as Effect50 } from "effect";
+import { Effect as Effect51 } from "effect";
 
 // src/lib/moderation-target.ts
-import { Effect as Effect49 } from "effect";
+import { Effect as Effect50 } from "effect";
 
 // src/lib/bird-actions.ts
-import { Effect as Effect48 } from "effect";
+import { Effect as Effect49 } from "effect";
 
 // src/lib/bird-command.ts
 import { access } from "node:fs/promises";
 import { constants as constants2 } from "node:fs";
-import { Data as Data3, Effect as Effect47 } from "effect";
+import { Data as Data3, Effect as Effect48 } from "effect";
 var BirdCommandUnavailableError = class extends Data3.TaggedError(
   "BirdCommandUnavailableError"
 ) {
@@ -23437,25 +24443,25 @@ function execFailureFromCause(command, cause) {
 }
 function assertBirdCommandAvailableEffect(command) {
   if (!isPathCommand(command)) {
-    return Effect47.void;
+    return Effect48.void;
   }
-  return Effect47.tryPromise({
+  return Effect48.tryPromise({
     try: () => Promise.resolve(access(command, constants2.X_OK)),
     catch: (cause) => new BirdCommandUnavailableError({
       message: formatBirdInstallHint(command),
       command,
       cause
     })
-  }).pipe(Effect47.asVoid);
+  }).pipe(Effect48.asVoid);
 }
 function getBirdCommandEffect() {
-  return Effect47.try({
+  return Effect48.try({
     try: () => getBirdCommand(),
     catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
   });
 }
 function runBirdCommandEffect(args, options) {
-  return Effect47.gen(function* () {
+  return Effect48.gen(function* () {
     const birdCommand = yield* getBirdCommandEffect();
     yield* assertBirdCommandAvailableEffect(birdCommand);
     return yield* runSubprocessEffect({
@@ -23468,8 +24474,8 @@ function runBirdCommandEffect(args, options) {
       ...options?.signal ? { signal: options.signal } : {},
       ...options?.killSignal ? { killSignal: options.killSignal } : {}
     }).pipe(
-      Effect47.map(({ stdout, stderr }) => ({ stdout, stderr })),
-      Effect47.mapError((cause) => execFailureFromCause(birdCommand, cause))
+      Effect48.map(({ stdout, stderr }) => ({ stdout, stderr })),
+      Effect48.mapError((cause) => execFailureFromCause(birdCommand, cause))
     );
   });
 }
@@ -23507,9 +24513,9 @@ function toError18(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function runBirdJsonCommandEffect2(args) {
-  return Effect48.gen(function* () {
+  return Effect49.gen(function* () {
     const { stdout } = yield* runBirdCommandEffect(args);
-    return yield* Effect48.try({
+    return yield* Effect49.try({
       try: () => JSON.parse(stripAnsi2(stdout)),
       catch: toError18
     });
@@ -23523,13 +24529,13 @@ function safeBirdProfileArg(query) {
   throw new Error("Invalid bird profile query");
 }
 function readBirdStatusViaBirdEffect(query) {
-  return Effect48.gen(function* () {
-    const safeQuery = yield* Effect48.try({
+  return Effect49.gen(function* () {
+    const safeQuery = yield* Effect49.try({
       try: () => safeBirdProfileArg(query),
       catch: toError18
     });
     return yield* runBirdJsonCommandEffect2(["status", safeQuery, "--json"]);
-  }).pipe(Effect48.catchAll(() => Effect48.succeed(null)));
+  }).pipe(Effect49.catchAll(() => Effect49.succeed(null)));
 }
 function readBirdStatusViaBird(query) {
   return runEffectPromise(readBirdStatusViaBirdEffect(query));
@@ -23566,8 +24572,8 @@ function toBirdLookupUser(payload) {
   };
 }
 function lookupProfileViaBirdEffect2(query) {
-  return Effect48.gen(function* () {
-    const safeQuery = yield* Effect48.try({
+  return Effect49.gen(function* () {
+    const safeQuery = yield* Effect49.try({
       try: () => safeBirdProfileArg(query),
       catch: toError18
     });
@@ -23578,11 +24584,11 @@ function lookupProfileViaBirdEffect2(query) {
       "1",
       "--json"
     ]);
-    return yield* Effect48.try({
+    return yield* Effect49.try({
       try: () => toBirdLookupUser(payload),
       catch: toError18
     });
-  }).pipe(Effect48.catchAll(() => Effect48.succeed(null)));
+  }).pipe(Effect49.catchAll(() => Effect49.succeed(null)));
 }
 function lookupProfileViaBird(query) {
   return runEffectPromise(lookupProfileViaBirdEffect2(query));
@@ -23593,8 +24599,8 @@ function runVerifiedBirdMutationEffect({
   verifyField,
   expectedValue
 }) {
-  return Effect48.gen(function* () {
-    const safeQuery = yield* Effect48.try({
+  return Effect49.gen(function* () {
+    const safeQuery = yield* Effect49.try({
       try: () => safeBirdProfileArg(query),
       catch: toError18
     });
@@ -23608,12 +24614,12 @@ function runVerifiedBirdMutationEffect({
       action,
       safeQuery
     ]).pipe(
-      Effect48.map(({ stdout, stderr }) => ({
+      Effect49.map(({ stdout, stderr }) => ({
         ok: true,
         output: normalizeOutput(stdout, stderr)
       })),
-      Effect48.catchAll(
-        (error) => Effect48.succeed({
+      Effect49.catchAll(
+        (error) => Effect49.succeed({
           ok: false,
           output: formatExecError2(error, `bird ${action} failed`)
         })
@@ -23692,7 +24698,7 @@ function toError19(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function trySync14(try_) {
-  return Effect49.try({
+  return Effect50.try({
     try: try_,
     catch: toError19
   });
@@ -23740,11 +24746,11 @@ function resolveLocalProfile(db, normalizedQuery) {
   };
 }
 function resolveProfileEffect(query, providedDb) {
-  return Effect49.gen(function* () {
+  return Effect50.gen(function* () {
     const db = providedDb ?? (yield* trySync14(() => getNativeDb()));
     const normalizedQuery = normalizeProfileQuery(query);
     if (!normalizedQuery) {
-      return yield* Effect49.fail(new Error("Missing profile handle or id"));
+      return yield* Effect50.fail(new Error("Missing profile handle or id"));
     }
     const local = yield* trySync14(
       () => resolveLocalProfile(db, normalizedQuery)
@@ -23753,7 +24759,7 @@ function resolveProfileEffect(query, providedDb) {
       if (local) {
         return local;
       }
-      return yield* Effect49.fail(
+      return yield* Effect50.fail(
         new Error(`Profile not found locally: ${query}`)
       );
     }
@@ -23765,8 +24771,8 @@ function resolveProfileEffect(query, providedDb) {
     const birdResult = yield* tryPromise(
       () => lookupProfileViaBird(local?.profile.handle ?? normalizedQuery)
     ).pipe(
-      Effect49.map((value) => ({ ok: true, value })),
-      Effect49.catchAll((error) => Effect49.succeed({ ok: false, error }))
+      Effect50.map((value) => ({ ok: true, value })),
+      Effect50.catchAll((error) => Effect50.succeed({ ok: false, error }))
     );
     if (birdResult.ok) {
       user = birdResult.value ?? void 0;
@@ -23777,9 +24783,9 @@ function resolveProfileEffect(query, providedDb) {
       const xurlResult = yield* tryPromise(
         () => /^\d+$/.test(normalizedQuery) ? lookupUsersByIds([normalizedQuery]) : lookupUsersByHandles([local?.profile.handle ?? normalizedQuery])
       ).pipe(
-        Effect49.map((value) => ({ ok: true, value })),
-        Effect49.catchAll(
-          (error) => Effect49.succeed({ ok: false, error })
+        Effect50.map((value) => ({ ok: true, value })),
+        Effect50.catchAll(
+          (error) => Effect50.succeed({ ok: false, error })
         )
       );
       if (xurlResult.ok) {
@@ -23792,13 +24798,13 @@ function resolveProfileEffect(query, providedDb) {
       if (local) {
         return local;
       }
-      return yield* Effect49.fail(lastError);
+      return yield* Effect50.fail(lastError);
     }
     if (!user) {
       if (local) {
         return local;
       }
-      return yield* Effect49.fail(new Error(`Profile not found: ${query}`));
+      return yield* Effect50.fail(new Error(`Profile not found: ${query}`));
     }
     if (local) {
       return yield* databaseWriteEffect(
@@ -23839,11 +24845,11 @@ function inspectProfileReplies(query, { limit = 12 } = {}) {
   return runEffectPromise(inspectProfileRepliesEffect(query, { limit }));
 }
 function inspectProfileRepliesEffect(query, { limit = 12 } = {}) {
-  return Effect50.gen(function* () {
+  return Effect51.gen(function* () {
     const resolved = yield* tryPromise(() => resolveProfile(query));
     const externalUserId = resolved.externalUserId;
     if (!externalUserId) {
-      return yield* Effect50.fail(
+      return yield* Effect51.fail(
         new Error(`Profile has no external Twitter user id: ${query}`)
       );
     }
@@ -23938,18 +24944,18 @@ function registerMentionCommands({
 }
 
 // src/lib/blocks.ts
-import { Effect as Effect53 } from "effect";
+import { Effect as Effect54 } from "effect";
 
 // src/lib/moderation-state.ts
-import { Effect as Effect52 } from "effect";
+import { Effect as Effect53 } from "effect";
 
 // src/lib/actions-transport.ts
-import { Effect as Effect51 } from "effect";
+import { Effect as Effect52 } from "effect";
 function toError20(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function trySync15(try_) {
-  return Effect51.try({
+  return Effect52.try({
     try: try_,
     catch: toError20
   });
@@ -23961,7 +24967,7 @@ function liveWritesDisabled4() {
   return process.env.BIRDCLAW_DISABLE_LIVE_WRITES === "1";
 }
 function verifyExpectedAccountEffect(expectedAccount) {
-  return Effect51.gen(function* () {
+  return Effect52.gen(function* () {
     if (!expectedAccount) return null;
     if (liveWritesDisabled4()) return null;
     const sourceUser = yield* tryPromise(() => lookupAuthenticatedUserFresh());
@@ -23971,7 +24977,7 @@ function verifyExpectedAccountEffect(expectedAccount) {
     const expectedHandle = profileHandleKey(expectedAccount.handle);
     if (expectedExternalUserId) {
       if (sourceUserId === expectedExternalUserId) return sourceUserId;
-      return yield* Effect51.fail(
+      return yield* Effect52.fail(
         new Error(
           `xurl is authenticated as user ${sourceUserId || "unknown"}, not account ${expectedAccount.id}`
         )
@@ -23979,7 +24985,7 @@ function verifyExpectedAccountEffect(expectedAccount) {
     }
     if (expectedHandle && sourceUsername === expectedHandle)
       return sourceUserId;
-    return yield* Effect51.fail(
+    return yield* Effect52.fail(
       new Error(
         sourceUsername ? `xurl is authenticated as @${sourceUsername}, not @${expectedHandle}` : "xurl authenticated user unavailable"
       )
@@ -23987,7 +24993,7 @@ function verifyExpectedAccountEffect(expectedAccount) {
   });
 }
 function runBirdActionEffect(action, query) {
-  return Effect51.gen(function* () {
+  return Effect52.gen(function* () {
     const result = yield* tryPromise(
       () => action === "block" ? blockUserViaBird(query) : action === "unblock" ? unblockUserViaBird(query) : action === "mute" ? muteUserViaBird(query) : unmuteUserViaBird(query)
     );
@@ -24007,7 +25013,7 @@ function getVerifyExpectation(action) {
   };
 }
 function runXurlActionEffect(action, query, targetUserId, verifiedSourceUserId) {
-  return Effect51.gen(function* () {
+  return Effect52.gen(function* () {
     if (!targetUserId) {
       return {
         ok: false,
@@ -24072,13 +25078,13 @@ function runModerationActionEffect({
   transport,
   expectedAccount
 }) {
-  return Effect51.gen(function* () {
+  return Effect52.gen(function* () {
     const requestedTransport = yield* trySync15(
       () => resolveActionsTransport(transport)
     );
     const verifyXurlAccount = () => verifyExpectedAccountEffect(expectedAccount).pipe(
-      Effect51.catchAll(
-        (error) => Effect51.succeed({
+      Effect52.catchAll(
+        (error) => Effect52.succeed({
           ok: false,
           output: error instanceof Error ? error.message : String(error),
           transport: "xurl"
@@ -24167,7 +25173,7 @@ function toError21(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function trySync16(try_) {
-  return Effect52.try({
+  return Effect53.try({
     try: try_,
     catch: toError21
   });
@@ -24286,20 +25292,20 @@ function resolveModerationTargetEffect({
   query,
   selfActionError
 }) {
-  return Effect52.gen(function* () {
+  return Effect53.gen(function* () {
     const db = yield* trySync16(() => getNativeDb());
     const resolvedAccountId = accountId || getDefaultAccountId(db);
     const accountHandle = yield* trySync16(
       () => getAccountHandle(db, resolvedAccountId)
     );
     if (!accountHandle) {
-      return yield* Effect52.fail(
+      return yield* Effect53.fail(
         new Error(`Unknown account: ${resolvedAccountId}`)
       );
     }
     const normalizedQuery = normalizeProfileQuery(query);
     if (normalizedQuery.toLowerCase() === accountHandle.toLowerCase()) {
-      return yield* Effect52.fail(new Error(selfActionError));
+      return yield* Effect53.fail(new Error(selfActionError));
     }
     const resolved = yield* resolveProfileEffect(query, db);
     const account = yield* trySync16(
@@ -24310,7 +25316,7 @@ function resolveModerationTargetEffect({
     );
     const accountExternalUserId = account?.external_user_id ?? getExternalUserId(accountProfile?.id ?? "");
     if (profileHandleKey(resolved.profile.handle) === profileHandleKey(accountHandle) || accountProfile?.id && resolved.profile.id === accountProfile.id || accountExternalUserId && resolved.externalUserId === accountExternalUserId) {
-      return yield* Effect52.fail(new Error(selfActionError));
+      return yield* Effect53.fail(new Error(selfActionError));
     }
     return {
       db,
@@ -24327,7 +25333,7 @@ function resolveModerationTargetEffect({
 }
 function addModerationEffect(kind, accountId, query, options = {}) {
   const descriptor = moderationDescriptors[kind];
-  return Effect52.gen(function* () {
+  return Effect53.gen(function* () {
     const { db, resolved, resolvedAccountId, accountIdentity, actionQuery } = yield* resolveModerationTargetEffect({
       accountId,
       query,
@@ -24377,7 +25383,7 @@ function addModeration(kind, accountId, query, options = {}) {
 }
 function recordModerationEffect(kind, accountId, query) {
   const descriptor = moderationDescriptors[kind];
-  return Effect52.gen(function* () {
+  return Effect53.gen(function* () {
     const { db, resolved, resolvedAccountId } = yield* resolveModerationTargetEffect({
       accountId,
       query,
@@ -24408,7 +25414,7 @@ function recordModeration(kind, accountId, query) {
 }
 function removeModerationEffect(kind, accountId, query, options = {}) {
   const descriptor = moderationDescriptors[kind];
-  return Effect52.gen(function* () {
+  return Effect53.gen(function* () {
     const { db, resolved, resolvedAccountId, accountIdentity, actionQuery } = yield* resolveModerationTargetEffect({
       accountId,
       query,
@@ -24484,7 +25490,7 @@ function toError22(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function trySync17(try_) {
-  return Effect53.try({
+  return Effect54.try({
     try: try_,
     catch: toError22
   });
@@ -24497,12 +25503,12 @@ function listBlocks({
   return listModerationState("block", { account, search, limit });
 }
 function syncBlocksEffect(accountId) {
-  return Effect53.gen(function* () {
+  return Effect54.gen(function* () {
     const db = yield* trySync17(() => getNativeDb());
     const resolvedAccountId = accountId || getDefaultAccountId(db);
     const accountHandle = getAccountHandle(db, resolvedAccountId);
     if (!accountHandle) {
-      return yield* Effect53.fail(
+      return yield* Effect54.fail(
         new Error(`Unknown account: ${resolvedAccountId}`)
       );
     }
@@ -24523,9 +25529,9 @@ function syncBlocksEffect(accountId) {
         }
       };
     }
-    return yield* Effect53.gen(function* () {
+    return yield* Effect54.gen(function* () {
       const me = yield* tryPromise(() => lookupAuthenticatedUserFresh()).pipe(
-        Effect53.mapError(toError22)
+        Effect54.mapError(toError22)
       );
       const sourceUserId = typeof me?.id === "string" && me.id.length > 0 ? me.id : null;
       const sourceUsername = typeof me?.username === "string" ? me.username.replace(/^@/, "") : "";
@@ -24572,7 +25578,7 @@ function syncBlocksEffect(accountId) {
       do {
         const page = yield* tryPromise(
           () => listBlockedUsers(sourceUserId, nextToken ?? void 0)
-        ).pipe(Effect53.mapError(toError22));
+        ).pipe(Effect54.mapError(toError22));
         const pageProfileIds = yield* databaseWriteEffect((writeDb) => {
           return page.items.map((user) => {
             const resolved = upsertProfileFromXUser(writeDb, user);
@@ -24614,8 +25620,8 @@ function syncBlocksEffect(accountId) {
         }
       };
     }).pipe(
-      Effect53.catchAll(
-        (error) => Effect53.succeed({
+      Effect54.catchAll(
+        (error) => Effect54.succeed({
           ok: false,
           accountId: resolvedAccountId,
           synced: remoteProfileIds.length > 0,
@@ -24766,7 +25772,7 @@ function registerModerationCommands({
 
 // src/lib/blocklist.ts
 import { readFile } from "node:fs/promises";
-import { Effect as Effect54 } from "effect";
+import { Effect as Effect55 } from "effect";
 function stripInlineCode(value) {
   const match = value.match(/`([^`]+)`/);
   return match?.[1] ?? value;
@@ -24803,15 +25809,15 @@ function parseBlocklistText(text) {
   return items;
 }
 function importBlocklistEffect(accountId, filePath) {
-  return Effect54.gen(function* () {
+  return Effect55.gen(function* () {
     const text = yield* tryPromise(() => readFile(filePath, "utf8"));
     const queries = parseBlocklistText(text);
     const items = [];
     for (const query of queries) {
       const blocked = yield* tryPromise(() => addBlock(accountId, query)).pipe(
-        Effect54.map((result2) => ({ ok: true, result: result2 })),
-        Effect54.catchAll(
-          (error) => Effect54.succeed({ ok: false, error })
+        Effect55.map((result2) => ({ ok: true, result: result2 })),
+        Effect55.catchAll(
+          (error) => Effect55.succeed({ ok: false, error })
         )
       );
       if (!blocked.ok) {
@@ -24867,7 +25873,7 @@ function registerModerationCommands2(context) {
 }
 
 // src/lib/link-index.ts
-import { Effect as Effect55 } from "effect";
+import { Effect as Effect56 } from "effect";
 var DEFAULT_EXPAND_CONCURRENCY = 12;
 function parseJsonField5(value, fallback) {
   if (typeof value !== "string" || value.length === 0) {
@@ -25029,7 +26035,7 @@ function expandWithConcurrencyEffect(db, urls, options) {
     misses: 0,
     errors: 0
   };
-  return Effect55.forEach(
+  return Effect56.forEach(
     urls,
     (url) => tryPromise(
       () => expandUrls([url], {
@@ -25038,7 +26044,7 @@ function expandWithConcurrencyEffect(db, urls, options) {
         timeoutMs: options.timeoutMs
       })
     ).pipe(
-      Effect55.map((results) => {
+      Effect56.map((results) => {
         const result = results[0];
         if (result.source === "network") {
           counts.networkExpansions++;
@@ -25055,10 +26061,10 @@ function expandWithConcurrencyEffect(db, urls, options) {
       })
     ),
     { concurrency }
-  ).pipe(Effect55.as(counts));
+  ).pipe(Effect56.as(counts));
 }
 function backfillLinkIndexEffect(options = {}) {
-  return Effect55.gen(function* () {
+  return Effect56.gen(function* () {
     const db = getNativeDb({ seedDemoData: false });
     const { occurrences, entityExpansions } = rebuildOccurrences(
       db,
@@ -25353,7 +26359,7 @@ import {
 } from "node:fs";
 import { appendFile, copyFile, rename, rm, writeFile } from "node:fs/promises";
 import path11 from "node:path";
-import { Effect as Effect56 } from "effect";
+import { Effect as Effect57 } from "effect";
 var DEFAULT_MAX_BYTES = 100 * 1024 * 1024;
 var PBS_PREFIXES = [
   "/media/",
@@ -25372,13 +26378,13 @@ function toMediaError(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 function tryMediaSync(try_) {
-  return Effect56.try({
+  return Effect57.try({
     try: try_,
     catch: toMediaError
   });
 }
 function tryMediaPromise(try_) {
-  return Effect56.tryPromise({
+  return Effect57.tryPromise({
     try: try_,
     catch: toMediaError
   });
@@ -25643,7 +26649,7 @@ function archivePathFor(item, mediaOriginalsDir) {
   return archiveTweetDirs(mediaOriginalsDir, item.tweetId).map((tweetDir) => path11.join(tweetDir, fileName)).find((archivePath) => existsSync5(archivePath)) ?? null;
 }
 function reuseFromArchiveEffect(item, mediaOriginalsDir, maxBytes) {
-  return Effect56.gen(function* () {
+  return Effect57.gen(function* () {
     const archivePath = archivePathFor(item, mediaOriginalsDir);
     if (!archivePath || !existsSync5(archivePath)) return null;
     const bytes = fileSize(archivePath);
@@ -25670,15 +26676,15 @@ function contentRangeTotal(response) {
   return total ? Number(total) : null;
 }
 function writeResponseBodyEffect(response, tmpPath, append, maxBytes, initialBytes) {
-  return Effect56.gen(function* () {
+  return Effect57.gen(function* () {
     if (!response.body)
-      return yield* Effect56.fail(new Error("missing response body"));
+      return yield* Effect57.fail(new Error("missing response body"));
     let bytes = 0;
     if (!append) {
       yield* tryMediaPromise(() => writeFile(tmpPath, Buffer.alloc(0)));
     }
     const reader = response.body.getReader();
-    const result = yield* Effect56.gen(function* () {
+    const result = yield* Effect57.gen(function* () {
       for (; ; ) {
         const { done, value } = yield* tryMediaPromise(() => reader.read());
         if (done) {
@@ -25688,31 +26694,31 @@ function writeResponseBodyEffect(response, tmpPath, append, maxBytes, initialByt
         bytes += chunk.length;
         if (initialBytes + bytes > maxBytes) {
           yield* tryMediaPromise(() => rm(tmpPath, { force: true })).pipe(
-            Effect56.catchAll(() => Effect56.void)
+            Effect57.catchAll(() => Effect57.void)
           );
-          return yield* Effect56.fail(new Error("max-bytes"));
+          return yield* Effect57.fail(new Error("max-bytes"));
         }
         yield* tryMediaPromise(() => appendFile(tmpPath, chunk));
       }
       return bytes;
     }).pipe(
-      Effect56.map((writtenBytes) => ({ ok: true, writtenBytes })),
-      Effect56.catchAll(
-        (error) => Effect56.gen(function* () {
+      Effect57.map((writtenBytes) => ({ ok: true, writtenBytes })),
+      Effect57.catchAll(
+        (error) => Effect57.gen(function* () {
           if (error.message === "max-bytes") {
             yield* tryMediaPromise(() => rm(tmpPath, { force: true })).pipe(
-              Effect56.catchAll(() => Effect56.void)
+              Effect57.catchAll(() => Effect57.void)
             );
           }
           yield* tryMediaPromise(() => reader.cancel(error)).pipe(
-            Effect56.catchAll(() => Effect56.void)
+            Effect57.catchAll(() => Effect57.void)
           );
           return { error, ok: false };
         })
       ),
-      Effect56.ensuring(Effect56.sync(() => reader.releaseLock()))
+      Effect57.ensuring(Effect57.sync(() => reader.releaseLock()))
     );
-    if (!result.ok) return yield* Effect56.fail(result.error);
+    if (!result.ok) return yield* Effect57.fail(result.error);
     return result.writtenBytes;
   });
 }
@@ -25724,13 +26730,13 @@ function fetchOneEffect({
   userAgent,
   maxBytes
 }) {
-  return Effect56.gen(function* () {
+  return Effect57.gen(function* () {
     let rateLimited = false;
     for (let attempt = 0; attempt <= retryMax; attempt += 1) {
       const partialBytes = item.kind === "image" ? 0 : fileSize(item.tmpPath);
       if (partialBytes > maxBytes) {
         yield* tryMediaPromise(() => rm(item.tmpPath, { force: true })).pipe(
-          Effect56.catchAll(() => Effect56.void)
+          Effect57.catchAll(() => Effect57.void)
         );
         return fail(item, "max-bytes");
       }
@@ -25742,9 +26748,9 @@ function fetchOneEffect({
           }
         })
       ).pipe(
-        Effect56.map((response2) => ({ ok: true, response: response2 })),
-        Effect56.catchAll(
-          (error) => Effect56.succeed({ error, ok: false })
+        Effect57.map((response2) => ({ ok: true, response: response2 })),
+        Effect57.catchAll(
+          (error) => Effect57.succeed({ error, ok: false })
         )
       );
       if (!responseResult.ok) {
@@ -25755,7 +26761,7 @@ function fetchOneEffect({
         rateLimited = true;
         if (attempt < retryMax) {
           yield* tryMediaPromise(() => sleep(1e3 * 2 ** attempt)).pipe(
-            Effect56.catchAll(() => Effect56.void)
+            Effect57.catchAll(() => Effect57.void)
           );
           continue;
         }
@@ -25767,7 +26773,7 @@ function fetchOneEffect({
       const expectedTotal = contentRangeTotal(response) ?? (contentLength(response) ?? 0) + (response.status === 206 ? partialBytes : 0);
       if (expectedTotal > maxBytes) {
         yield* tryMediaPromise(() => rm(item.tmpPath, { force: true })).pipe(
-          Effect56.catchAll(() => Effect56.void)
+          Effect57.catchAll(() => Effect57.void)
         );
         return fail(item, "max-bytes");
       }
@@ -25779,9 +26785,9 @@ function fetchOneEffect({
         maxBytes,
         append ? partialBytes : 0
       ).pipe(
-        Effect56.map((bytes) => ({ bytes, ok: true })),
-        Effect56.catchAll(
-          (error) => Effect56.succeed({ error, ok: false })
+        Effect57.map((bytes) => ({ bytes, ok: true })),
+        Effect57.catchAll(
+          (error) => Effect57.succeed({ error, ok: false })
         )
       );
       if (!bytesResult.ok) {
@@ -25855,7 +26861,7 @@ function runGroupEffect(items, parallel, pacingMs, now2, sleep, worker) {
       );
     })
   );
-  return Effect56.forEach(pacedItems, runPaced, {
+  return Effect57.forEach(pacedItems, runPaced, {
     concurrency: Math.min(parallel, items.length),
     discard: true
   });
@@ -25864,7 +26870,7 @@ function fetchTweetMedia(options = {}) {
   return runEffectPromise(fetchTweetMediaEffect(options));
 }
 function fetchTweetMediaEffect(options = {}) {
-  return Effect56.gen(function* () {
+  return Effect57.gen(function* () {
     const now2 = options.now ?? Date.now;
     const startedAt = now2();
     const sleep = options.sleep ?? defaultSleep;
@@ -25931,7 +26937,7 @@ function fetchTweetMediaEffect(options = {}) {
           retryMax,
           userAgent,
           maxBytes
-        }).pipe(Effect56.map((fetched) => applyFetched(result, fetched)))
+        }).pipe(Effect57.map((fetched) => applyFetched(result, fetched)))
       );
       yield* runGroupEffect(
         httpCandidates.filter((item) => item.kind === "image"),
@@ -25979,9 +26985,9 @@ function formatMediaFetchResult(result) {
 }
 
 // src/lib/whois.ts
-import { Effect as Effect57 } from "effect";
+import { Effect as Effect58 } from "effect";
 function trySync18(try_) {
-  return Effect57.try({
+  return Effect58.try({
     try: try_,
     catch: (cause) => cause
   });
@@ -26512,7 +27518,7 @@ function loadWhoisConversations(query, options, includeDms, context, limit) {
   return [...merged.values()];
 }
 function runWhoisEffect(query, options = {}) {
-  return Effect57.gen(function* () {
+  return Effect58.gen(function* () {
     const includeDms = options.dms ?? true;
     const includeTweets = options.tweets ?? false;
     const limit = options.limit ?? 10;
@@ -26759,7 +27765,7 @@ function registerSearchCommands({
   parsePositiveIntegerOption: parsePositiveIntegerOption2
 }) {
   const searchCommand = program2.command("search").description("Search local data");
-  searchCommand.command("tweets [query]").option("--resource <resource>", "home, mentions, or authored", "home").option("--replied", "Only replied items").option("--unreplied", "Only unreplied items").option("--since <date>", "Include tweets created at or after this date").option("--until <date>", "Include tweets created before this date").option("--originals-only", "Exclude authored replies that start with @").option("--hide-low-quality", "Hide RTs, tiny replies, and link-only noise").option(
+  searchCommand.command("tweets [query]").option("--resource <resource>", "home, mentions, or authored", "home").option("--account <accountId>", "Account id").option("--list <name>", "Only authors in a cached X List").option("--list-id <id>", "Only authors in a cached X List id").option("--replied", "Only replied items").option("--unreplied", "Only unreplied items").option("--since <date>", "Include tweets created at or after this date").option("--until <date>", "Include tweets created before this date").option("--originals-only", "Exclude authored replies that start with @").option("--hide-low-quality", "Hide RTs, tiny replies, and link-only noise").option(
     "--min-likes <n>",
     "Override the low-quality like threshold (default 50)"
   ).option("--quality-reason", "Include qualityReason on each row").option("--liked", "Only liked tweets").option("--bookmarked", "Only bookmarked tweets").option("--limit <n>", "Limit results", "20").action(async (query, options) => {
@@ -26769,10 +27775,18 @@ function registerSearchCommands({
     );
     if (options.minLikes !== void 0 && minLikes === void 0) return;
     await autoUpdateBeforeRead2();
+    const selectedList = options.list || options.listId ? resolveStoredXListSelector({
+      account: options.account,
+      name: options.list,
+      listId: options.listId
+    }) : void 0;
     const replyFilter = options.replied ? "replied" : options.unreplied ? "unreplied" : "all";
     print2(
       listTimelineItems({
         resource: options.resource === "mentions" ? "mentions" : options.resource === "authored" ? "authored" : "home",
+        account: options.account,
+        listAccountId: selectedList?.accountId,
+        listId: selectedList?.listId,
         search: query,
         replyFilter,
         since: options.since,
@@ -26955,7 +27969,7 @@ import { Readable as Readable2 } from "node:stream";
 import { pathToFileURL } from "node:url";
 
 // src/lib/http-effect.ts
-import { Effect as Effect58 } from "effect";
+import { Effect as Effect59 } from "effect";
 var LOCAL_WEB_PEER_HEADER = "x-birdclaw-local-peer";
 
 // src/lib/production-server.ts
@@ -27229,7 +28243,7 @@ function registerStorageCommands({
 }
 
 // src/lib/authored-live.ts
-import { Effect as Effect59 } from "effect";
+import { Effect as Effect60 } from "effect";
 var AuthoredSyncError = class extends Error {
   constructor(message, exitCode) {
     super(message);
@@ -27471,10 +28485,10 @@ function resolveAuthoredIdentityEffect({
   account,
   db
 }) {
-  return Effect59.gen(function* () {
+  return Effect60.gen(function* () {
     const status = yield* liveTransportGateway.xurl.getTransportStatus();
     if (status.availableTransport !== "xurl") {
-      return yield* Effect59.fail(new AuthoredSyncError(status.statusText, 4));
+      return yield* Effect60.fail(new AuthoredSyncError(status.statusText, 4));
     }
     const resolvedAccount = yield* trySync(
       () => resolveLiveSyncAccount(db, account)
@@ -27489,7 +28503,7 @@ function resolveAuthoredIdentityEffect({
     const authenticated = yield* liveTransportGateway.xurl.lookupAuthenticatedUser();
     const authenticatedUser = userFromAuthenticatedPayload(authenticated);
     if (!authenticatedUser?.id) {
-      return yield* Effect59.fail(
+      return yield* Effect60.fail(
         new AuthoredSyncError(
           "Could not resolve authenticated Twitter user id",
           4
@@ -27497,7 +28511,7 @@ function resolveAuthoredIdentityEffect({
       );
     }
     if (normalizeUsername(authenticatedUser.username) !== normalizeUsername(resolvedAccount.username)) {
-      return yield* Effect59.fail(
+      return yield* Effect60.fail(
         new AuthoredSyncError(
           `xurl is authenticated as @${authenticatedUser.username}, but selected account ${resolvedAccount.accountId} is @${resolvedAccount.username}. Link the account external_user_id or switch xurl login before syncing authored tweets.`,
           4
@@ -27796,9 +28810,9 @@ function syncAuthoredTweetsEffect({
   sinceId,
   untilId
 }) {
-  return Effect59.gen(function* () {
+  return Effect60.gen(function* () {
     if (mode !== "xurl") {
-      return yield* Effect59.fail(
+      return yield* Effect60.fail(
         new Error("authored sync only supports --mode xurl")
       );
     }
@@ -27861,7 +28875,7 @@ function syncAuthoredTweetsEffect({
             sourceUser
           })
         ).pipe(
-          Effect59.flatMap(
+          Effect60.flatMap(
             () => trySync(() => {
               newestSeenId = maxTweetId(
                 newestSeenId,
@@ -27964,6 +28978,32 @@ function registerSyncCommands({
   autoSyncAfterWrite: autoSyncAfterWrite2
 }) {
   const syncCommand = program2.command("sync").description("Refresh live Twitter collections into the local store");
+  syncCommand.command("lists").description("Sync owned X Lists and rate-limited membership pages").option("--account <accountId>", "Account id").option("--mode <mode>", "auto, bird, or xurl", "auto").option("--max-lists <n>", "Maximum owned Lists to inspect", "20").option("--member-limit <n>", "Members per transport page", "20").option("--max-member-pages <n>", "Maximum membership pages per List", "1").option("--delay-ms <n>", "Delay between Lists", "1000").action(async (options) => {
+    try {
+      const result = await syncXLists({
+        account: options.account,
+        mode: options.mode,
+        maxLists: Number(options.maxLists),
+        memberLimit: Number(options.memberLimit),
+        maxMemberPages: Number(options.maxMemberPages),
+        delayMs: Number(options.delayMs)
+      });
+      await autoSyncAfterWrite2();
+      print2(result, true);
+      if (!result.ok) process.exitCode = 5;
+    } catch (error) {
+      print2(
+        {
+          ok: false,
+          kind: "lists",
+          mode: options.mode,
+          error: errorMessage(error)
+        },
+        true
+      );
+      process.exitCode = 1;
+    }
+  });
   syncCommand.command("timeline").description("Refresh live home timeline through xurl or bird").option("--account <accountId>", "Account id").option("--mode <mode>", "auto, xurl, or bird", "auto").option("--limit <n>", "Result limit", "100").option("--max-pages <n>", "Stop after N xurl pages", "3").option("--for-you", 'Fetch "For You" instead of chronological Following').option("--cache-ttl <seconds>", "Live-cache freshness window", "120").option("--refresh", "Bypass live-cache freshness window").action(async (options) => {
     const result = await syncHomeTimeline({
       account: options.account,
@@ -28138,6 +29178,7 @@ registerMentionCommands(commandContext);
 registerDirectMessageCommands(commandContext);
 registerSyncCommands(commandContext);
 registerJobCommands(commandContext);
+registerListCommands(commandContext);
 registerModerationCommands2(commandContext);
 registerComposeCommands(commandContext);
 registerInboxCommand(commandContext);