@atproto/bsky 0.0.221 → 0.0.223

package/tests/views/bookmarks.test.ts

@@ -2,15 +2,14 @@ import assert from 'node:assert'
 import {
   $Typed,
   AppBskyBookmarkCreateBookmark,
+  AppBskyBookmarkDefs,
   AppBskyBookmarkDeleteBookmark,
+  AppBskyBookmarkGetBookmarks,
   AppBskyFeedDefs,
   AtpAgent,
+  ids,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { BookmarkView } from '../../src/lexicon/types/app/bsky/bookmark/defs'
-import { OutputSchema as GetBookmarksOutputSchema } from '../../src/lexicon/types/app/bsky/bookmark/getBookmarks'
-import { PostView } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { forSnapshot, paginateAll } from '../_util'
 
 type Database = TestNetwork['bsky']['db']
@@ -32,7 +31,7 @@ describe('appview bookmarks views', () => {
       dbPostgresSchema: 'bsky_views_bookmarks',
     })
     db = network.bsky.db
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -224,7 +223,7 @@ describe('appview bookmarks views', () => {
       await create(alice, sc.posts[dan][0].ref)
       await create(alice, sc.posts[dan][1].ref)
 
-      const results = (out: GetBookmarksOutputSchema[]) =>
+      const results = (out: AppBskyBookmarkGetBookmarks.OutputSchema[]) =>
         out.flatMap((res) => res.bookmarks)
 
       const paginator = async (cursor?: string) => {
@@ -248,8 +247,8 @@ describe('appview bookmarks views', () => {
 
       // Check items are the same.
       const sort = (
-        a: { item: $Typed<PostView> },
-        b: { item: $Typed<PostView> },
+        a: { item: $Typed<AppBskyFeedDefs.PostView> },
+        b: { item: $Typed<AppBskyFeedDefs.PostView> },
       ) => (a.item.uri > b.item.uri ? 1 : -1)
       expect([...paginated].sort(sort)).toEqual([...full].sort(sort))
 
@@ -304,8 +303,10 @@ const clearBookmarks = async (db: Database) => {
 }
 
 function assertPostViews(
-  bookmarks: GetBookmarksOutputSchema['bookmarks'],
-): asserts bookmarks is (BookmarkView & { item: $Typed<PostView> })[] {
+  bookmarks: AppBskyBookmarkGetBookmarks.OutputSchema['bookmarks'],
+): asserts bookmarks is (AppBskyBookmarkDefs.BookmarkView & {
+  item: $Typed<AppBskyFeedDefs.PostView>
+})[] {
   bookmarks.forEach((b) => {
     assert(
       AppBskyFeedDefs.isPostView(b.item),

package/tests/views/drafts.test.ts

@@ -1,13 +1,12 @@
-import { AppBskyDraftCreateDraft, AtpAgent } from '@atproto/api'
+import {
+  AppBskyDraftCreateDraft,
+  AppBskyDraftDefs,
+  AppBskyDraftGetDrafts,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import { TID } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import {
-  Draft,
-  DraftView,
-  DraftWithId,
-} from '../../src/lexicon/types/app/bsky/draft/defs'
-import { OutputSchema as GetDraftsOutputSchema } from '../../src/lexicon/types/app/bsky/draft/getDrafts'
 import { paginateAll } from '../_util'
 
 type Database = TestNetwork['bsky']['db']
@@ -32,7 +31,7 @@ describe('appview drafts views', () => {
       },
     })
     db = network.bsky.db
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -50,7 +49,7 @@ describe('appview drafts views', () => {
     await network.close()
   })
 
-  const makeDraft = (): Draft => ({
+  const makeDraft = (): AppBskyDraftDefs.Draft => ({
     posts: [{ text: 'Hello, world!' }],
   })
 
@@ -62,7 +61,7 @@ describe('appview drafts views', () => {
       },
     )
 
-  const create = async (actor: string, draft: Draft) =>
+  const create = async (actor: string, draft: AppBskyDraftDefs.Draft) =>
     agent.app.bsky.draft.createDraft(
       { draft },
       {
@@ -73,7 +72,10 @@ describe('appview drafts views', () => {
       },
     )
 
-  const update = async (actor: string, draftWithId: DraftWithId) =>
+  const update = async (
+    actor: string,
+    draftWithId: AppBskyDraftDefs.DraftWithId,
+  ) =>
     agent.app.bsky.draft.updateDraft(
       { draft: draftWithId },
       {
@@ -117,7 +119,7 @@ describe('appview drafts views', () => {
     })
 
     it('creates drafts with multiple posts (threads)', async () => {
-      const draft: Draft = {
+      const draft: AppBskyDraftDefs.Draft = {
         posts: [
           { text: 'First post in thread' },
           { text: 'Second post in thread' },
@@ -149,7 +151,9 @@ describe('appview drafts views', () => {
 
   describe('update', () => {
     it('updates an existing draft', async () => {
-      const draft1: Draft = { posts: [{ text: 'First version' }] }
+      const draft1: AppBskyDraftDefs.Draft = {
+        posts: [{ text: 'First version' }],
+      }
 
       await create(alice, draft1)
       const { data: data0 } = await get(alice)
@@ -157,7 +161,7 @@ describe('appview drafts views', () => {
       expect(data0.drafts[0].draft.posts[0].text).toBe('First version')
 
       const draftId = data0.drafts[0].id
-      const draft2: DraftWithId = {
+      const draft2: AppBskyDraftDefs.DraftWithId = {
         id: draftId,
         draft: { posts: [{ text: 'Updated version' }] },
       }
@@ -169,7 +173,7 @@ describe('appview drafts views', () => {
     })
 
     it('silently ignores updates to non-existing drafts', async () => {
-      const nonExistingDraft: DraftWithId = {
+      const nonExistingDraft: AppBskyDraftDefs.DraftWithId = {
         id: TID.nextStr(),
         draft: { posts: [{ text: 'This draft does not exist' }] },
       }
@@ -258,7 +262,7 @@ describe('appview drafts views', () => {
         await create(alice, makeDraft())
       }
 
-      const results = (out: GetDraftsOutputSchema[]) =>
+      const results = (out: AppBskyDraftGetDrafts.OutputSchema[]) =>
         out.flatMap((res) => res.drafts)
 
       const paginator = async (cursor?: string) => {
@@ -278,7 +282,10 @@ describe('appview drafts views', () => {
       const paginated = results(paginatedRes)
 
       // Check items are the same.
-      const sort = (a: DraftView, b: DraftView) => (a.id > b.id ? 1 : -1)
+      const sort = (
+        a: AppBskyDraftDefs.DraftView,
+        b: AppBskyDraftDefs.DraftView,
+      ) => (a.id > b.id ? 1 : -1)
       expect([...paginated].sort(sort)).toEqual([...full].sort(sort))
 
       // Check pagination ordering (most recent first).

package/tests/views/feed-hidden-replies.test.ts

@@ -1,6 +1,5 @@
-import AtpAgent from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 import { Users, feedHiddenRepliesSeed } from '../seed/feed-hidden-replies'
 
 describe('feed hidden replies', () => {
@@ -14,8 +13,8 @@ describe('feed hidden replies', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_tests_feed_hidden_replies',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
 
     const result = await feedHiddenRepliesSeed(sc)

package/tests/views/feed-view-post.test.ts

@@ -1,7 +1,6 @@
 import assert from 'node:assert'
-import { AppBskyFeedDefs, AtUri, AtpAgent } from '@atproto/api'
+import { AppBskyFeedDefs, AtUri, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 
 /**
  * The frontend computes feed slices for display using at-most one
@@ -32,8 +31,8 @@ describe('pds thread views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_feed_view_post',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice

package/tests/views/follows.test.ts

@@ -1,8 +1,10 @@
-import { AtpAgent } from '@atproto/api'
+import {
+  AppBskyGraphGetFollowers,
+  AppBskyGraphGetFollows,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import { SeedClient, TestNetwork, followsSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema as GetFollowersOutputSchema } from '../../src/lexicon/types/app/bsky/graph/getFollowers'
-import { OutputSchema as GetFollowsOutputSchema } from '../../src/lexicon/types/app/bsky/graph/getFollows'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds follow views', () => {
@@ -17,7 +19,7 @@ describe('pds follow views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_follows',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await followsSeed(sc)
     await network.processAll()
@@ -116,7 +118,7 @@ describe('pds follow views', () => {
   })
 
   it('paginates followers', async () => {
-    const results = (results: GetFollowersOutputSchema[]) =>
+    const results = (results: AppBskyGraphGetFollowers.OutputSchema[]) =>
       results.flatMap((res) => res.followers)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.graph.getFollowers(
@@ -280,7 +282,7 @@ describe('pds follow views', () => {
   })
 
   it('paginates follows', async () => {
-    const results = (results: GetFollowsOutputSchema[]) =>
+    const results = (results: AppBskyGraphGetFollows.OutputSchema[]) =>
       results.flatMap((res) => res.follows)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.graph.getFollows(

package/tests/views/get-config.test.ts

@@ -10,7 +10,7 @@ describe('get config', () => {
       network = await TestNetwork.create({
         dbPostgresSchema: 'bsky_tests_live_now_config_off',
       })
-      agent = network.bsky.getClient()
+      agent = network.bsky.getAgent()
 
       await network.processAll()
     })
@@ -29,11 +29,11 @@ describe('get config', () => {
   describe('when live now is configured', () => {
     const liveNowConfig = [
       {
-        did: 'did:plc:asdf123',
+        did: 'did:plc:asdf123' as const,
         domains: ['example.com', 'atproto.com'],
       },
       {
-        did: 'did:plc:sdfg234',
+        did: 'did:plc:sdfg234' as const,
         domains: ['example.com'],
       },
     ]
@@ -48,7 +48,7 @@ describe('get config', () => {
           liveNowConfig,
         },
       })
-      agent = network.bsky.getClient()
+      agent = network.bsky.getAgent()
 
       await network.processAll()
     })

package/tests/views/get-suggested-onboarding-users.test.ts

@@ -2,10 +2,12 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import AtpAgent from '@atproto/api'
+import {
+  AppBskyUnspeccedGetOnboardingSuggestedUsersSkeleton,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema } from '../../src/lexicon/types/app/bsky/unspecced/getSuggestedUsersSkeleton'
 
 type User = {
   id: string
@@ -71,11 +73,11 @@ describe('getSuggestedOnboardingUsers', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_tests_get_suggested_onboarding_users',
       bsky: {
-        topicsUrl: mockServer.url,
-        topicsApiKey: 'test',
+        suggestionsUrl: mockServer.url,
+        suggestionsApiKey: 'test',
       },
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
 
     const result = await seed(sc)
@@ -173,11 +175,12 @@ class MockServer {
   private createApp() {
     const app = express()
     app.get(
-      '/xrpc/app.bsky.unspecced.getSuggestedUsersSkeleton',
+      '/xrpc/app.bsky.unspecced.getOnboardingSuggestedUsersSkeleton',
       (req, res) => {
-        const skeleton: OutputSchema = {
-          dids: Array.from(this.mockedDids.values()),
-        }
+        const skeleton: AppBskyUnspeccedGetOnboardingSuggestedUsersSkeleton.OutputSchema =
+          {
+            dids: Array.from(this.mockedDids.values()),
+          }
         return res.json(skeleton)
       },
     )

package/tests/views/get-suggested-starter-packs.test.ts

@@ -2,10 +2,12 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import AtpAgent from '@atproto/api'
+import {
+  AppBskyUnspeccedGetSuggestedStarterPacksSkeleton,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema } from '../../src/lexicon/types/app/bsky/unspecced/getSuggestedStarterPacksSkeleton'
 import {
   StarterPacks,
   Users,
@@ -31,7 +33,7 @@ describe('getSuggestedStarterPacks', () => {
         topicsApiKey: 'test',
       },
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
 
     const result = await starterPacksSeed(sc)
@@ -90,7 +92,10 @@ class MockServer {
   app: Application
   server: Server
 
-  mockedStarterPackUris = new Map<string, OutputSchema['starterPacks'][0]>()
+  mockedStarterPackUris = new Map<
+    string,
+    AppBskyUnspeccedGetSuggestedStarterPacksSkeleton.OutputSchema['starterPacks'][0]
+  >()
 
   constructor() {
     this.app = this.createApp()
@@ -117,9 +122,10 @@ class MockServer {
     app.get(
       '/xrpc/app.bsky.unspecced.getSuggestedStarterPacksSkeleton',
       (req, res) => {
-        const skeleton: OutputSchema = {
-          starterPacks: Array.from(this.mockedStarterPackUris.values()),
-        }
+        const skeleton: AppBskyUnspeccedGetSuggestedStarterPacksSkeleton.OutputSchema =
+          {
+            starterPacks: Array.from(this.mockedStarterPackUris.values()),
+          }
         return res.json(skeleton)
       },
     )

package/tests/views/get-trends.test.ts

@@ -3,10 +3,8 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import AtpAgent from '@atproto/api'
+import { AppBskyUnspeccedGetTrendsSkeleton, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema } from '../../src/lexicon/types/app/bsky/unspecced/getTrendsSkeleton'
 import { Users, trendsSeed } from '../seed/get-trends'
 
 describe('getTrends', () => {
@@ -27,7 +25,7 @@ describe('getTrends', () => {
         topicsApiKey: 'test',
       },
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
 
     const result = await trendsSeed(sc)
@@ -98,7 +96,10 @@ class MockTrendsServer {
   app: Application
   server: Server
 
-  mockedTrendSkeletons = new Map<string, OutputSchema['trends'][0]>()
+  mockedTrendSkeletons = new Map<
+    string,
+    AppBskyUnspeccedGetTrendsSkeleton.OutputSchema['trends'][0]
+  >()
 
   constructor() {
     this.app = this.createApp()
@@ -123,7 +124,7 @@ class MockTrendsServer {
   private createApp() {
     const app = express()
     app.get('/xrpc/app.bsky.unspecced.getTrendsSkeleton', (req, res) => {
-      const skeleton: OutputSchema = {
+      const skeleton: AppBskyUnspeccedGetTrendsSkeleton.OutputSchema = {
         trends: Array.from(this.mockedTrendSkeletons.values()),
       }
       return res.json(skeleton)

package/tests/views/known-followers.test.ts

@@ -1,6 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 import { knownFollowersSeed } from '../seed/known-followers'
 
 describe('known followers (social proof)', () => {
@@ -15,8 +14,8 @@ describe('known followers (social proof)', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_known_followers',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     seedClient = network.getSeedClient()
 
     await knownFollowersSeed(seedClient)

package/tests/views/labeler-service.test.ts

@@ -1,12 +1,12 @@
 import assert from 'node:assert'
 import {
+  AppBskyEmbedRecord,
   AppBskyLabelerDefs,
   AtpAgent,
   ComAtprotoModerationDefs,
+  ids,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
 import { forSnapshot, stripViewerFromLabeler } from '../_util'
 
 describe('labeler service views', () => {
@@ -26,8 +26,8 @@ describe('labeler service views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_labeler_service',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
@@ -158,7 +158,7 @@ describe('labeler service views', () => {
     const serviceViews = await agent.api.app.bsky.labeler.getServices({
       dids: [alice],
     })
-    assert(isRecordEmbedView(postViews.data.posts[0].embed))
+    assert(AppBskyEmbedRecord.isView(postViews.data.posts[0].embed))
     expect(postViews.data.posts[0].embed.record).toMatchObject(
       serviceViews.data.views[0],
     )

package/tests/views/labels-needs-review.test.ts

@@ -1,8 +1,6 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import { AppBskyFeedDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { isThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 
 describe('bsky needs-review labels', () => {
   let network: TestNetwork
@@ -13,7 +11,7 @@ describe('bsky needs-review labels', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_needs_review_labels',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
 
@@ -78,11 +76,12 @@ describe('bsky needs-review labels', () => {
       } = await agent.app.bsky.feed.getPostThread({
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
       })
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(false)
@@ -146,11 +145,12 @@ describe('bsky needs-review labels', () => {
           ),
         },
       )
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(true)
@@ -170,11 +170,12 @@ describe('bsky needs-review labels', () => {
           ),
         },
       )
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(true)
@@ -209,11 +210,12 @@ describe('bsky needs-review labels', () => {
       } = await agent.app.bsky.feed.getPostThread({
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
       })
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(false)
@@ -277,11 +279,12 @@ describe('bsky needs-review labels', () => {
           ),
         },
       )
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(true)
@@ -301,11 +304,12 @@ describe('bsky needs-review labels', () => {
           ),
         },
       )
-      assert(isThreadViewPost(thread))
+      assert(AppBskyFeedDefs.isThreadViewPost(thread))
       expect(
         thread.replies?.some((reply) => {
           return (
-            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+            AppBskyFeedDefs.isThreadViewPost(reply) &&
+            reply.post.author.did === sc.dids.geoff
           )
         }),
       ).toBe(true)

package/tests/views/labels-takedown.test.ts

@@ -1,7 +1,6 @@
 import assert from 'node:assert'
-import { AppBskyLabelerDefs, AtpAgent } from '@atproto/api'
+import { AppBskyLabelerDefs, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky takedown labels', () => {
   let network: TestNetwork
@@ -21,8 +20,8 @@ describe('bsky takedown labels', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_takedown_labels',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
 

package/tests/views/likes.test.ts

@@ -1,7 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import { AppBskyFeedGetLikes, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, likesSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema as GetLikesOutputSchema } from '../../src/lexicon/types/app/bsky/feed/getLikes'
 import { constantDate, forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds like views', () => {
@@ -19,7 +17,7 @@ describe('pds like views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_likes',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await likesSeed(sc)
     await sc.createAccount('frankie', {
@@ -72,7 +70,7 @@ describe('pds like views', () => {
   })
 
   it('paginates', async () => {
-    const results = (results: GetLikesOutputSchema[]) =>
+    const results = (results: AppBskyFeedGetLikes.OutputSchema[]) =>
       results.flatMap((res) => res.likes)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.feed.getLikes(

package/tests/views/list-feed.test.ts

@@ -1,7 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import { AppBskyFeedGetListFeed, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { OutputSchema as GetListFeedOutputSchema } from '../../src/lexicon/types/app/bsky/feed/getListFeed'
 import {
   forSnapshot,
   paginateAll,
@@ -25,7 +23,7 @@ describe('list feed views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_list_feed',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
@@ -60,7 +58,7 @@ describe('list feed views', () => {
   })
 
   it('paginates', async () => {
-    const results = (results: GetListFeedOutputSchema[]) =>
+    const results = (results: AppBskyFeedGetListFeed.OutputSchema[]) =>
       results.flatMap((res) => res.feed)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.feed.getListFeed(