@atproto/bsky 0.0.221 → 0.0.223

package/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -1,11 +1,10 @@
-import { AtpAgent } from '@atproto/api'
 import { mapDefined } from '@atproto/common'
+import { Client, DidString } from '@atproto/lex'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { DataPlaneClient } from '../../../../data-plane'
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { parseString } from '../../../../hydration/util'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/searchActorsTypeahead'
+import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -23,7 +22,7 @@ export default function (server: Server, ctx: AppContext) {
     noBlocks,
     presentation,
   )
-  server.app.bsky.actor.searchActorsTypeahead({
+  server.add(app.bsky.actor.searchActorsTypeahead, {
     auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth, req }) => {
       const viewer = auth.credentials.iss
@@ -42,7 +41,9 @@ export default function (server: Server, ctx: AppContext) {
   })
 }
 
-const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
+const skeleton = async (
+  inputs: SkeletonFnInput<Context, Params>,
+): Promise<Skeleton> => {
   const { ctx, params } = inputs
   const term = params.q ?? params.term ?? ''
 
@@ -50,17 +51,18 @@ const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
   // add typeahead option
   // add hits total
 
-  if (ctx.searchAgent) {
-    const { data: res } =
-      await ctx.searchAgent.app.bsky.unspecced.searchActorsSkeleton({
+  if (ctx.searchClient) {
+    const { actors } = await ctx.searchClient.call(
+      app.bsky.unspecced.searchActorsSkeleton,
+      {
         typeahead: true,
         q: term,
         limit: params.limit,
         viewer: params.hydrateCtx.viewer ?? undefined,
-      })
+      },
+    )
     return {
-      dids: res.actors.map(({ did }) => did),
-      cursor: parseString(res.cursor),
+      dids: actors.map(({ did }) => did),
     }
   }
 
@@ -69,8 +71,7 @@ const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
     limit: params.limit,
   })
   return {
-    dids: res.dids,
-    cursor: parseString(res.cursor),
+    dids: res.dids as DidString[],
   }
 }
 
@@ -110,11 +111,13 @@ type Context = {
   dataplane: DataPlaneClient
   hydrator: Hydrator
   views: Views
-  searchAgent?: AtpAgent
+  searchClient?: Client
 }
 
-type Params = QueryParams & { hydrateCtx: HydrateCtx }
+type Params = app.bsky.actor.searchActorsTypeahead.$Params & {
+  hydrateCtx: HydrateCtx
+}
 
 type Skeleton = {
-  dids: string[]
+  dids: DidString[]
 }

package/src/api/app/bsky/ageassurance/begin.ts

@@ -5,10 +5,11 @@ import { getAgeAssuranceRegionConfig } from '@atproto/api'
 import {
   InvalidRequestError,
   MethodNotImplementedError,
+  Server,
 } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { InputSchema } from '../../../../lexicon/types/app/bsky/ageassurance/begin'
+type InputSchema = app.bsky.ageassurance.begin.$InputBody
+import { app } from '../../../../lexicons/index.js'
 import { httpLogger as log } from '../../../../logger'
 import { ActorInfo } from '../../../../proto/bsky_pb'
 import { AGE_ASSURANCE_CONFIG } from '../../../age-assurance/const'
@@ -26,7 +27,7 @@ import { createLocationString } from '../../../age-assurance/util'
 import { getClientUa } from '../../../kws/util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.ageassurance.begin({
+  server.add(app.bsky.ageassurance.begin, {
     auth: ctx.authVerifier.standard,
     handler: async ({ auth, input, req }) => {
       if (!ctx.kwsClient) {

package/src/api/app/bsky/ageassurance/getConfig.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AGE_ASSURANCE_CONFIG } from '../../../../api/age-assurance/const'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.ageassurance.getConfig({
+  server.add(app.bsky.ageassurance.getConfig, {
     auth: ctx.authVerifier.standardOptional,
     handler: async () => {
       return {

package/src/api/app/bsky/ageassurance/getState.ts

@@ -1,29 +1,34 @@
-import { UpstreamFailureError } from '@atproto/xrpc-server'
+import { DatetimeString } from '@atproto/syntax'
+import { Server, UpstreamFailureError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { ActorInfo } from '../../../../proto/bsky_pb'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.ageassurance.getState({
+  server.add(app.bsky.ageassurance.getState, {
     auth: ctx.authVerifier.standard,
-    handler: async ({ auth }) => {
+    handler: async ({
+      auth,
+    }): Promise<app.bsky.ageassurance.getState.$Output> => {
       const viewer = auth.credentials.iss
       const actor = await getActorInfo(ctx, viewer)
 
+      const lastInitiatedAt = actor.ageAssuranceStatus?.lastInitiatedAt
+
       return {
         encoding: 'application/json',
         body: {
           state: {
-            lastInitiatedAt:
-              actor.ageAssuranceStatus?.lastInitiatedAt
-                ?.toDate()
-                .toISOString() || undefined,
+            lastInitiatedAt: lastInitiatedAt
+              ? (lastInitiatedAt.toDate().toISOString() as DatetimeString)
+              : undefined,
             status: actor.ageAssuranceStatus?.status || 'unknown',
             access: actor.ageAssuranceStatus?.access || 'unknown',
           },
           metadata: {
-            accountCreatedAt:
-              actor.createdAt?.toDate().toISOString() || undefined,
+            accountCreatedAt: actor.createdAt
+              ? (actor.createdAt.toDate().toISOString() as DatetimeString)
+              : undefined,
           },
         },
       }

package/src/api/app/bsky/bookmark/createBookmark.ts

@@ -1,12 +1,12 @@
 import { TID } from '@atproto/common'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { Bookmark } from '../../../../lexicon/types/app/bsky/bookmark/defs'
+import { app } from '../../../../lexicons/index.js'
 import { Namespaces } from '../../../../stash'
 import { validateUri } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.bookmark.createBookmark({
+  server.add(app.bsky.bookmark.createBookmark, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       const actorDid = auth.credentials.iss
@@ -31,7 +31,7 @@ export default function (server: Server, ctx: AppContext) {
             cid,
             uri,
           },
-        } satisfies Bookmark,
+        } satisfies app.bsky.bookmark.defs.Bookmark,
         key: TID.nextStr(),
       })
     },

package/src/api/app/bsky/bookmark/deleteBookmark.ts

@@ -1,10 +1,11 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { Namespaces } from '../../../../stash'
 import { validateUri } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.bookmark.deleteBookmark({
+  server.add(app.bsky.bookmark.deleteBookmark, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       const actorDid = auth.credentials.iss

package/src/api/app/bsky/bookmark/getBookmarks.ts

@@ -1,8 +1,8 @@
 import { mapDefined } from '@atproto/common'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/bookmark/getBookmarks'
+import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -21,7 +21,7 @@ export default function (server: Server, ctx: AppContext) {
     noRules, // Blocks are included and handled on views. Mutes are included.
     presentation,
   )
-  server.app.bsky.bookmark.getBookmarks({
+  server.add(app.bsky.bookmark.getBookmarks, {
     auth: ctx.authVerifier.standard,
     handler: async ({ params, auth, req }) => {
       const viewer = auth.credentials.iss
@@ -86,7 +86,7 @@ type Context = {
   views: Views
 }
 
-type Params = QueryParams & {
+type Params = app.bsky.bookmark.getBookmarks.$Params & {
   hydrateCtx: HydrateCtx & { viewer: string }
 }
 

package/src/api/app/bsky/bookmark/util.ts

@@ -1,12 +1,12 @@
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { ids } from '../../../../lexicon/lexicons'
+import { app } from '../../../../lexicons/index.js'
 
 export const validateUri = (uri: string) => {
   const atUri = new AtUri(uri)
-  if (atUri.collection !== ids.AppBskyFeedPost) {
+  if (atUri.collection !== app.bsky.feed.post.$type) {
     throw new InvalidRequestError(
-      `Only '${ids.AppBskyFeedPost}' records can be bookmarked`,
+      `Only '${app.bsky.feed.post.$type}' records can be bookmarked`,
       'UnsupportedCollection',
     )
   }

package/src/api/app/bsky/contact/dismissMatch.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.dismissMatch({
+  server.add(app.bsky.contact.dismissMatch, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       assertRolodexOrThrowUnimplemented(ctx)

package/src/api/app/bsky/contact/getMatches.ts

@@ -1,12 +1,13 @@
 import { mapDefined } from '@atproto/common'
+import { DidString } from '@atproto/lex'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/contact/getMatches'
+import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
   SkeletonFnInput,
@@ -18,7 +19,8 @@ import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   const getMatches = createPipeline(skeleton, hydration, noBlocks, presentation)
-  server.app.bsky.contact.getMatches({
+
+  server.add(app.bsky.contact.getMatches, {
     auth: ctx.authVerifier.standard,
     handler: async ({ params, auth, req }) => {
       assertRolodexOrThrowUnimplemented(ctx)
@@ -57,7 +59,7 @@ const skeleton = async (
   )
   return {
     actor,
-    subjects,
+    subjects: subjects as DidString[],
     cursor: cursor || undefined,
   }
 }
@@ -101,12 +103,12 @@ type Context = {
   views: Views
 }
 
-type Params = QueryParams & {
+type Params = app.bsky.contact.getMatches.$Params & {
   hydrateCtx: HydrateCtx & { viewer: string }
 }
 
 type SkeletonState = {
   actor: string
-  subjects: string[]
+  subjects: DidString[]
   cursor?: string
 }

package/src/api/app/bsky/contact/getSyncStatus.ts

@@ -1,10 +1,11 @@
+import { DatetimeString } from '@atproto/syntax'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { SyncStatus } from '../../../../lexicon/types/app/bsky/contact/defs'
+import { app } from '../../../../lexicons/index.js'
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.getSyncStatus({
+  server.add(app.bsky.contact.getSyncStatus, {
     auth: ctx.authVerifier.standard,
     handler: async ({ auth }) => {
       assertRolodexOrThrowUnimplemented(ctx)
@@ -16,14 +17,15 @@ export default function (server: Server, ctx: AppContext) {
         }),
       )
 
-      let syncStatus: SyncStatus | undefined
-      if (res.status && res.status.syncedAt) {
-        const syncedAt = res.status?.syncedAt?.toDate().toISOString()
-        syncStatus = {
-          matchesCount: res.status.matchesCount,
-          syncedAt,
-        }
-      }
+      const syncStatus: app.bsky.contact.defs.SyncStatus | undefined =
+        res.status && res.status.syncedAt
+          ? {
+              matchesCount: res.status.matchesCount,
+              syncedAt: res.status.syncedAt
+                .toDate()
+                .toISOString() as DatetimeString,
+            }
+          : undefined
 
       return {
         encoding: 'application/json',

package/src/api/app/bsky/contact/importContacts.ts

@@ -1,13 +1,13 @@
 import { mapDefined } from '@atproto/common'
+import { DidString } from '@atproto/syntax'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Server } from '../../../../lexicon'
-import { MatchAndContactIndex } from '../../../../lexicon/types/app/bsky/contact/defs'
-import { InputSchema } from '../../../../lexicon/types/app/bsky/contact/importContacts'
+import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
   SkeletonFnInput,
@@ -26,7 +26,7 @@ export default function (server: Server, ctx: AppContext) {
     noRules, //
     presentation,
   )
-  server.app.bsky.contact.importContacts({
+  server.add(app.bsky.contact.importContacts, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth, req }) => {
       assertRolodexOrThrowUnimplemented(ctx)
@@ -38,10 +38,7 @@ export default function (server: Server, ctx: AppContext) {
         viewer,
       })
 
-      const result = await importContacts(
-        { ...input.body, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await importContacts({ ...input.body, hydrateCtx }, ctx)
 
       return {
         encoding: 'application/json',
@@ -74,7 +71,7 @@ const hydration = async (
 ) => {
   const { ctx, params, skeleton } = input
   const { matches } = skeleton
-  const subjects = matches.map((m) => m.subject)
+  const subjects = matches.map((m) => m.subject as DidString)
   return ctx.hydrator.hydrateProfiles(subjects, params.hydrateCtx)
 }
 
@@ -87,8 +84,11 @@ const presentation = (input: {
   const { ctx, skeleton, hydration } = input
   const matchesAndContactIndexes = mapDefined(
     skeleton.matches,
-    ({ subject, inputIndex }): MatchAndContactIndex | undefined => {
-      const profile = ctx.views.profile(subject, hydration)
+    ({
+      subject,
+      inputIndex,
+    }): app.bsky.contact.defs.MatchAndContactIndex | undefined => {
+      const profile = ctx.views.profile(subject as DidString, hydration)
 
       if (!profile) {
         return undefined
@@ -109,7 +109,7 @@ type Context = {
   views: Views
 }
 
-type Params = InputSchema & {
+type Params = app.bsky.contact.importContacts.$InputBody & {
   hydrateCtx: HydrateCtx & { viewer: string }
 }
 

package/src/api/app/bsky/contact/removeData.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.removeData({
+  server.add(app.bsky.contact.removeData, {
     auth: ctx.authVerifier.standard,
     handler: async ({ auth }) => {
       assertRolodexOrThrowUnimplemented(ctx)

package/src/api/app/bsky/contact/sendNotification.ts

@@ -1,12 +1,12 @@
 import { TID } from '@atproto/common'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { Notification } from '../../../../lexicon/types/app/bsky/contact/defs'
+import { app } from '../../../../lexicons/index.js'
 import { Namespaces } from '../../../../stash'
 import { assertRolodexOrThrowUnimplemented } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.sendNotification({
+  server.add(app.bsky.contact.sendNotification, {
     auth: ctx.authVerifier.role,
     handler: async ({ input }) => {
       // Assert rolodex even though we don't call it, it is a proxy to whether the app is configured with contact import support.
@@ -20,7 +20,7 @@ export default function (server: Server, ctx: AppContext) {
         payload: {
           from,
           to,
-        } satisfies Notification,
+        } satisfies app.bsky.contact.defs.Notification,
         key: TID.nextStr(),
       })
 

package/src/api/app/bsky/contact/startPhoneVerification.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.startPhoneVerification({
+  server.add(app.bsky.contact.startPhoneVerification, {
     auth: ctx.authVerifier.standard,
     handler: async ({ auth, input }) => {
       assertRolodexOrThrowUnimplemented(ctx)

package/src/api/app/bsky/contact/verifyPhone.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons/index.js'
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.contact.verifyPhone({
+  server.add(app.bsky.contact.verifyPhone, {
     auth: ctx.authVerifier.standard,
     handler: async ({ auth, input }) => {
       assertRolodexOrThrowUnimplemented(ctx)

package/src/api/app/bsky/draft/createDraft.ts

@@ -1,12 +1,11 @@
 import { TID } from '@atproto/common'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { DraftWithId } from '../../../../lexicon/types/app/bsky/draft/defs'
+import { app } from '../../../../lexicons/index.js'
 import { Namespaces } from '../../../../stash'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.draft.createDraft({
+  server.add(app.bsky.draft.createDraft, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       const actorDid = auth.credentials.iss
@@ -25,7 +24,7 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       const draftId = TID.nextStr()
-      const draftWithId: DraftWithId = {
+      const draftWithId: app.bsky.draft.defs.DraftWithId = {
         id: draftId,
         draft,
       }

package/src/api/app/bsky/draft/deleteDraft.ts

@@ -1,9 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { app } from '../../../../lexicons'
 import { Namespaces } from '../../../../stash'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.draft.deleteDraft({
+  server.add(app.bsky.draft.deleteDraft, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       const actorDid = auth.credentials.iss

package/src/api/app/bsky/draft/getDrafts.ts

@@ -1,13 +1,10 @@
-import { jsonStringToLex } from '@atproto/lexicon'
+import { DatetimeString, lexParse } from '@atproto/lex'
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import {
-  DraftView,
-  DraftWithId,
-} from '../../../../lexicon/types/app/bsky/draft/defs'
+import { app } from '../../../../lexicons/index.js'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.draft.getDrafts({
+  server.add(app.bsky.draft.getDrafts, {
     auth: ctx.authVerifier.standard,
     handler: async ({ params, auth }) => {
       const viewer = auth.credentials.iss
@@ -18,19 +15,20 @@ export default function (server: Server, ctx: AppContext) {
         cursor: params.cursor,
       })
 
-      const draftViews = drafts.map((d): DraftView => {
-        const draftWithId = jsonStringToLex(
-          Buffer.from(d.payload).toString('utf8'),
-        ) as DraftWithId
+      const draftViews = drafts.map((d): app.bsky.draft.defs.DraftView => {
+        const jsonStr = Buffer.from(d.payload).toString('utf8')
+        const draftWithId = lexParse<app.bsky.draft.defs.DraftWithId>(jsonStr)
         return {
           id: draftWithId.id,
           draft: draftWithId.draft,
           // The date should always be present, but we avoid required fields on protobuf by convention,
           // so requires a fallback value to please TS.
-          createdAt:
-            d.createdAt?.toDate().toISOString() ?? new Date(0).toISOString(),
-          updatedAt:
-            d.updatedAt?.toDate().toISOString() ?? new Date(0).toISOString(),
+          createdAt: (
+            d.createdAt?.toDate() ?? new Date(0)
+          ).toISOString() as DatetimeString,
+          updatedAt: (
+            d.updatedAt?.toDate() ?? new Date(0)
+          ).toISOString() as DatetimeString,
         }
       })
 

package/src/api/app/bsky/draft/updateDraft.ts

@@ -1,10 +1,10 @@
+import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { DraftWithId } from '../../../../lexicon/types/app/bsky/draft/defs'
+import { app } from '../../../../lexicons/index.js'
 import { Namespaces } from '../../../../stash'
 
 export default function (server: Server, ctx: AppContext) {
-  server.app.bsky.draft.updateDraft({
+  server.add(app.bsky.draft.updateDraft, {
     auth: ctx.authVerifier.standard,
     handler: async ({ input, auth }) => {
       const actorDid = auth.credentials.iss
@@ -18,7 +18,7 @@ export default function (server: Server, ctx: AppContext) {
       await ctx.stashClient.update({
         actorDid,
         namespace: Namespaces.AppBskyDraftDefsDraftWithId,
-        payload: draftWithId satisfies DraftWithId,
+        payload: draftWithId satisfies app.bsky.draft.defs.DraftWithId,
         key: draftWithId.id,
       })
     },

package/src/api/app/bsky/feed/getActorFeeds.ts

@@ -1,5 +1,6 @@
 import { mapDefined } from '@atproto/common'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AtUriString } from '@atproto/lex'
+import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { DataPlaneClient } from '../../../../data-plane'
 import {
@@ -8,8 +9,7 @@ import {
   Hydrator,
 } from '../../../../hydration/hydrator'
 import { parseString } from '../../../../hydration/util'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorFeeds'
+import { app } from '../../../../lexicons/index.js'
 import { createPipeline, noRules } from '../../../../pipeline'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
@@ -21,7 +21,7 @@ export default function (server: Server, ctx: AppContext) {
     noRules,
     presentation,
   )
-  server.app.bsky.feed.getActorFeeds({
+  server.add(app.bsky.feed.getActorFeeds, {
     auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params, req }) => {
       const viewer = auth.credentials.iss
@@ -55,7 +55,7 @@ const skeleton = async (inputs: {
     limit: params.limit,
   })
   return {
-    feedUris: feedsRes.uris,
+    feedUris: feedsRes.uris as AtUriString[],
     cursor: parseString(feedsRes.cursor),
   }
 }
@@ -93,9 +93,9 @@ type Context = {
   dataplane: DataPlaneClient
 }
 
-type Params = QueryParams & { hydrateCtx: HydrateCtx }
+type Params = app.bsky.feed.getActorFeeds.$Params & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
-  feedUris: string[]
+  feedUris: AtUriString[]
   cursor?: string
 }