From cc3f62a6a18759919e0d0614ff6dca18fba4d9df Mon Sep 17 00:00:00 2001
From: claude <imdat2999@gmail.com>
Date: Thu, 26 Mar 2026 14:06:51 +0000
Subject: [PATCH] refactor: reorganize proto clients and settings UI

Move generated proto imports under the new server api path and align gRPC auth/client usage with the renamed clients. Polish settings UI details by adding a shared language icon and refining Ads VAST table presentation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 components.d.ts                               |    2 +
 src/components/icons/LanguageIcon.vue         |   19 +
 .../useSettingsPreferencesQuery.ts            |    4 +-
 src/mocks/videos.ts                           |    2 +-
 src/routes/overview/Overview.vue              |    2 +-
 .../overview/components/RecentVideos.vue      |    2 +-
 .../AdsVast/components/AdsVastTable.tsx       |   21 +-
 src/routes/settings/AdsVast/types.ts          |    4 +-
 src/routes/settings/Billing/Billing.vue       |    2 +-
 .../Billing/components/PaymentHistory.tsx     |    2 +-
 .../Billing/components/PlanSelection.tsx      |    2 +-
 .../Billing/components/UpgradePlan.tsx        |    2 +-
 .../components/SecurityLanguageRow.vue        |    7 +-
 src/routes/settings/admin/Payments.vue        |    2 +-
 src/routes/video/CopyVideoModal.vue           |    2 +-
 src/routes/video/DetailVideoModal.vue         |    2 +-
 src/routes/video/Videos.vue                   |    2 +-
 .../video/components/VideoBulkActions.vue     |    2 +-
 src/routes/video/components/VideoTable.vue    |    2 +-
 src/server/api/proto/agent/v1/woodpecker.ts   | 2734 +++++++++++++++++
 .../{gen => api}/proto/app/v1/account.ts      |  323 +-
 src/server/{gen => api}/proto/app/v1/admin.ts |   97 +-
 src/server/{gen => api}/proto/app/v1/auth.ts  |   33 +-
 .../{gen => api}/proto/app/v1/catalog.ts      |   94 +-
 .../{gen => api}/proto/app/v1/common.ts       |    0
 .../{gen => api}/proto/app/v1/payments.ts     |   25 +-
 .../{gen => api}/proto/app/v1/videos.ts       |   29 +-
 .../proto/google/protobuf/timestamp.ts        |    0
 .../proto/google/protobuf/wrappers.ts         |    0
 src/server/middlewares/authenticate.ts        |    4 +-
 src/server/routes/auth.ts                     |    6 +-
 src/server/routes/rpc/admin.ts                |   72 +-
 src/server/routes/rpc/auth.ts                 |   14 +-
 src/server/routes/rpc/me.ts                   |   74 +-
 src/server/services/grpcClient.ts             |  198 +-
 src/server/utils/index.ts                     |    2 +-
 src/server/utils/proto/v1/user.ts             |    6 +-
 src/stores/auth.ts                            |    2 +-
 38 files changed, 3229 insertions(+), 567 deletions(-)
 create mode 100644 src/components/icons/LanguageIcon.vue
 create mode 100644 src/server/api/proto/agent/v1/woodpecker.ts
 rename src/server/{gen => api}/proto/app/v1/account.ts (95%)
 rename src/server/{gen => api}/proto/app/v1/admin.ts (99%)
 rename src/server/{gen => api}/proto/app/v1/auth.ts (97%)
 rename src/server/{gen => api}/proto/app/v1/catalog.ts (96%)
 rename src/server/{gen => api}/proto/app/v1/common.ts (100%)
 rename src/server/{gen => api}/proto/app/v1/payments.ts (97%)
 rename src/server/{gen => api}/proto/app/v1/videos.ts (98%)
 rename src/server/{gen => api}/proto/google/protobuf/timestamp.ts (100%)
 rename src/server/{gen => api}/proto/google/protobuf/wrappers.ts (100%)

diff --git a/components.d.ts b/components.d.ts
index b871514..104cc60 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -55,6 +55,7 @@ declare module 'vue' {
     Home: typeof import('./src/components/icons/Home.vue')['default']
     ImageIcon: typeof import('./src/components/icons/ImageIcon.vue')['default']
     InfoIcon: typeof import('./src/components/icons/InfoIcon.vue')['default']
+    LanguageIcon: typeof import('./src/components/icons/LanguageIcon.vue')['default']
     Layout: typeof import('./src/components/icons/Layout.vue')['default']
     LayoutDashboard: typeof import('./src/components/icons/LayoutDashboard.vue')['default']
     LinkIcon: typeof import('./src/components/icons/LinkIcon.vue')['default']
@@ -144,6 +145,7 @@ declare global {
   const Home: typeof import('./src/components/icons/Home.vue')['default']
   const ImageIcon: typeof import('./src/components/icons/ImageIcon.vue')['default']
   const InfoIcon: typeof import('./src/components/icons/InfoIcon.vue')['default']
+  const LanguageIcon: typeof import('./src/components/icons/LanguageIcon.vue')['default']
   const Layout: typeof import('./src/components/icons/Layout.vue')['default']
   const LayoutDashboard: typeof import('./src/components/icons/LayoutDashboard.vue')['default']
   const LinkIcon: typeof import('./src/components/icons/LinkIcon.vue')['default']
diff --git a/src/components/icons/LanguageIcon.vue b/src/components/icons/LanguageIcon.vue
new file mode 100644
index 0000000..7c61e9e
--- /dev/null
+++ b/src/components/icons/LanguageIcon.vue
@@ -0,0 +1,19 @@
+<template>
+    <svg v-if="filled" aria-hidden="true" aria-label="" class="v-mid m-a" height="24" role="img" viewBox="0 0 468 468"
+        width="24">
+        <path
+            d="M42 74v320c0 18 14 32 32 32h320c18 0 32-14 32-32V74c0-18-14-32-32-32H74c-18 0-32 14-32 32zm80 160c0-9 7-16 16-16h80v-80c0-9 7-16 16-16s16 7 16 16v80h80c9 0 16 7 16 16s-7 16-16 16h-80v80c0 9-7 16-16 16s-16-7-16-16v-80h-80c-9 0-16-7-16-16z"
+            fill="#a6acb9" />
+        <path
+            d="M74 42c-18 0-32 14-32 32v320c0 18 14 32 32 32h320c18 0 32-14 32-32V74c0-18-14-32-32-32H74zM10 74c0-35 29-64 64-64h320c35 0 64 29 64 64v320c0 35-29 64-64 64H74c-35 0-64-29-64-64V74zm208 256v-80h-80c-9 0-16-7-16-16s7-16 16-16h80v-80c0-9 7-16 16-16s16 7 16 16v80h80c9 0 16 7 16 16s-7 16-16 16h-80v80c0 9-7 16-16 16s-16-7-16-16z"
+            fill="currentColor" />
+    </svg>
+    <svg v-else xmlns="http://www.w3.org/2000/svg" class="v-mid m-a" height="24" viewBox="-10 -226 468 468">
+        <path
+            d="M64-184c-18 0-32 14-32 32v320c0 18 14 32 32 32h320c18 0 32-14 32-32v-320c0-18-14-32-32-32H64zM0-152c0-35 29-64 64-64h320c35 0 64 29 64 64v320c0 35-29 64-64 64H64c-35 0-64-29-64-64v-320zm208 256V24h-80c-9 0-16-7-16-16s7-16 16-16h80v-80c0-9 7-16 16-16s16 7 16 16v80h80c9 0 16 7 16 16s-7 16-16 16h-80v80c0 9-7 16-16 16s-16-7-16-16z"
+            fill="currentColor" />
+    </svg>
+</template>
+<script lang="ts" setup>
+defineProps<{  filled?: boolean }>();
+</script>
\ No newline at end of file
diff --git a/src/composables/useSettingsPreferencesQuery.ts b/src/composables/useSettingsPreferencesQuery.ts
index 8801370..f864277 100644
--- a/src/composables/useSettingsPreferencesQuery.ts
+++ b/src/composables/useSettingsPreferencesQuery.ts
@@ -1,6 +1,6 @@
 import { client as rpcClient } from '@/api/rpcclient';
-import type { Preferences } from '@/server/gen/proto/app/v1/common';
-import type { UpdatePreferencesRequest } from '@/server/gen/proto/app/v1/account';
+import type { Preferences } from '@/server/api/proto/app/v1/common';
+import type { UpdatePreferencesRequest } from '@/server/api/proto/app/v1/account';
 import { useQuery } from '@pinia/colada';
 
 export const SETTINGS_PREFERENCES_QUERY_KEY = ['settings', 'preferences'] as const;
diff --git a/src/mocks/videos.ts b/src/mocks/videos.ts
index 0ca60db..f5608f3 100644
--- a/src/mocks/videos.ts
+++ b/src/mocks/videos.ts
@@ -1,4 +1,4 @@
-import type { Video as ModelVideo } from "@/server/gen/proto/app/v1/common";
+import type { Video as ModelVideo } from "@/server/api/proto/app/v1/common";
 
 export const mockVideos: ModelVideo[] = [
     {
diff --git a/src/routes/overview/Overview.vue b/src/routes/overview/Overview.vue
index 98143f6..f2e239a 100644
--- a/src/routes/overview/Overview.vue
+++ b/src/routes/overview/Overview.vue
@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { client as rpcClient } from '@/api/rpcclient';
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import { useUsageQuery } from '@/composables/useUsageQuery';
 import PageHeader from '@/components/dashboard/PageHeader.vue';
 import { computed, onMounted, ref } from 'vue';
diff --git a/src/routes/overview/components/RecentVideos.vue b/src/routes/overview/components/RecentVideos.vue
index 8bbdb2b..aaec4a3 100644
--- a/src/routes/overview/components/RecentVideos.vue
+++ b/src/routes/overview/components/RecentVideos.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import BaseTable from '@/components/ui/BaseTable.vue';
 import EmptyState from '@/components/dashboard/EmptyState.vue';
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import { formatDate, formatDuration } from '@/lib/utils';
 import type { ColumnDef } from '@tanstack/vue-table';
 import { useTranslation } from 'i18next-vue';
diff --git a/src/routes/settings/AdsVast/components/AdsVastTable.tsx b/src/routes/settings/AdsVast/components/AdsVastTable.tsx
index 21c8345..9ac65e2 100644
--- a/src/routes/settings/AdsVast/components/AdsVastTable.tsx
+++ b/src/routes/settings/AdsVast/components/AdsVastTable.tsx
@@ -13,6 +13,7 @@ import AppButton from '@/components/ui/AppButton.vue';
 import AppSwitch from '@/components/ui/AppSwitch.vue';
 import BaseTable from '@/components/ui/BaseTable.vue';
 import SettingsTableSkeleton from '@/routes/settings/components/SettingsTableSkeleton.vue';
+import { formatDate } from '../../DomainsDns/helpers';
 
 export default defineComponent({
   name: 'AdTemplateTable',
@@ -79,7 +80,7 @@ export default defineComponent({
         header: t('settings.adsVast.table.template'),
         accessorFn: (row) => row.name || '',
         cell: ({ row }) => (
-          <div>
+          <>
             <div class="flex flex-wrap items-center gap-2">
               <span class="text-sm font-medium text-foreground">{row.original.name || ''}</span>
               {row.original.isDefault && (
@@ -89,9 +90,9 @@ export default defineComponent({
               )}
             </div>
             <p class="mt-0.5 text-xs text-foreground/50">
-              {t('settings.adsVast.createdOn', { date: row.original.createdAt || '-' })}
+              {t('settings.adsVast.createdOn', { date: formatDate(row.original.createdAt) || '-' })}
             </p>
-          </div>
+          </>
         ),
         meta: {
           headerClass: 'px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-foreground/50',
@@ -170,12 +171,8 @@ export default defineComponent({
         header: t('common.actions'),
         enableSorting: false,
         cell: ({ row }) => (
-          <div class="flex flex-wrap items-center justify-end gap-2">
-            {row.original.isDefault ? (
-              <span class="inline-flex items-center rounded-full bg-primary/10 px-2 py-1 text-xs font-medium text-primary">
-                {t('settings.adsVast.actions.default')}
-              </span>
-            ) : (
+          <div class="flex flex-wrap items-center justify-center gap-2">
+            {!row.original.isDefault && (
               <AppButton
                 variant="ghost"
                 size="sm"
@@ -214,12 +211,12 @@ export default defineComponent({
           </div>
         ),
         meta: {
-          headerClass: 'px-6 py-3 text-right text-xs font-medium uppercase tracking-wider text-foreground/50',
-          cellClass: 'px-6 py-3 text-right',
+          headerClass: 'px-6 py-3 text-center text-xs font-medium uppercase tracking-wider text-foreground/50 [&>div]:justify-center',
+          cellClass: 'px-6 py-3 text-center',
         },
       },
     ]);
-
+    
     return () => (
       <>
         {props.isInitialLoading ? (
diff --git a/src/routes/settings/AdsVast/types.ts b/src/routes/settings/AdsVast/types.ts
index 6cdf819..af20b44 100644
--- a/src/routes/settings/AdsVast/types.ts
+++ b/src/routes/settings/AdsVast/types.ts
@@ -1,6 +1,6 @@
-export type { AdTemplate } from '@/server/gen/proto/app/v1/common';
+export type { AdTemplate } from '@/server/api/proto/app/v1/common';
 export type {
     CreateAdTemplateRequest,
     DeleteAdTemplateRequest,
     UpdateAdTemplateRequest,
-} from '@/server/gen/proto/app/v1/catalog';
+} from '@/server/api/proto/app/v1/catalog';
diff --git a/src/routes/settings/Billing/Billing.vue b/src/routes/settings/Billing/Billing.vue
index 7e0bc8a..23fa0e7 100644
--- a/src/routes/settings/Billing/Billing.vue
+++ b/src/routes/settings/Billing/Billing.vue
@@ -6,7 +6,7 @@ import { useUsageQuery } from '@/composables/useUsageQuery';
 import BillingTopupDialog from '@/routes/settings/Billing/components/BillingTopupDialog.vue';
 import BillingUsageSection from '@/routes/settings/Billing/components/BillingUsageSection.vue';
 import SettingsSectionCard from '@/routes/settings/components/SettingsSectionCard.vue';
-import type { Plan as ModelPlan } from '@/server/gen/proto/app/v1/common';
+import type { Plan as ModelPlan } from '@/server/api/proto/app/v1/common';
 import { useAuthStore } from '@/stores/auth';
 import { computed, ref } from 'vue';
 import SettingsRow from '../components/SettingsRow.vue';
diff --git a/src/routes/settings/Billing/components/PaymentHistory.tsx b/src/routes/settings/Billing/components/PaymentHistory.tsx
index b7cf28c..6ff883e 100644
--- a/src/routes/settings/Billing/components/PaymentHistory.tsx
+++ b/src/routes/settings/Billing/components/PaymentHistory.tsx
@@ -5,7 +5,7 @@ import AppButton from "@/components/ui/AppButton.vue";
 import BaseTable from "@/components/ui/BaseTable.vue";
 import { useAppToast } from "@/composables/useAppToast";
 import { getApiErrorMessage, getStatusStyles } from "@/lib/utils";
-import { PaymentHistoryItem } from "@/server/gen/proto/app/v1/common";
+import { PaymentHistoryItem } from "@/server/api/proto/app/v1/common";
 import { useAuthStore } from "@/stores/auth";
 import { useQuery } from "@pinia/colada";
 import type { ColumnDef } from "@tanstack/vue-table";
diff --git a/src/routes/settings/Billing/components/PlanSelection.tsx b/src/routes/settings/Billing/components/PlanSelection.tsx
index bfad948..78b7ac7 100644
--- a/src/routes/settings/Billing/components/PlanSelection.tsx
+++ b/src/routes/settings/Billing/components/PlanSelection.tsx
@@ -2,7 +2,7 @@ import { client as rpcClient } from '@/api/rpcclient';
 import CheckIcon from '@/components/icons/CheckIcon.vue';
 import Credit from '@/components/icons/Credit.vue';
 import { cn } from '@/lib/utils';
-import type { Plan as ModelPlan } from '@/server/gen/proto/app/v1/common';
+import type { Plan as ModelPlan } from '@/server/api/proto/app/v1/common';
 import { useAuthStore } from '@/stores/auth';
 import { useQuery } from '@pinia/colada';
 import { useTranslation } from 'i18next-vue';
diff --git a/src/routes/settings/Billing/components/UpgradePlan.tsx b/src/routes/settings/Billing/components/UpgradePlan.tsx
index 1acf5c7..73828b5 100644
--- a/src/routes/settings/Billing/components/UpgradePlan.tsx
+++ b/src/routes/settings/Billing/components/UpgradePlan.tsx
@@ -7,7 +7,7 @@ import AppDialog from '@/components/ui/AppDialog.vue';
 import AppInput from '@/components/ui/AppInput.vue';
 import { useAppToast } from '@/composables/useAppToast';
 import { getApiErrorMessage, getApiErrorPayload } from '@/lib/utils';
-import type { Plan as ModelPlan } from '@/server/gen/proto/app/v1/common';
+import type { Plan as ModelPlan } from '@/server/api/proto/app/v1/common';
 import { useAuthStore } from '@/stores/auth';
 
 const TERM_OPTIONS = [1, 3, 6, 12] as const;
diff --git a/src/routes/settings/SecurityNConnected/components/SecurityLanguageRow.vue b/src/routes/settings/SecurityNConnected/components/SecurityLanguageRow.vue
index 1996f32..5e98129 100644
--- a/src/routes/settings/SecurityNConnected/components/SecurityLanguageRow.vue
+++ b/src/routes/settings/SecurityNConnected/components/SecurityLanguageRow.vue
@@ -28,12 +28,7 @@ const updateSelectedLanguage = (event: Event) => {
         actionsClass="flex items-center gap-2"
     >
         <template #icon>
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 text-info" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <circle cx="12" cy="12" r="10" />
-                <path d="M2 12h20" />
-                <path d="M12 2a15 15 0 0 1 0 20" />
-                <path d="M12 2a15 15 0 0 0 0 20" />
-            </svg>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 536"><path d="M269 477c58-131 80-180 128-288 5-12 16-19 29-19s24 7 29 19l128 288c7 16 0 35-16 42s-35 0-42-16l-20-45H347l-20 45c-7 16-26 23-42 16s-23-26-16-42zm107-83h100l-50-113-50 113z" fill="#a6acb9"/><path d="M170 10c18 0 32 14 32 32v32h128c18 0 32 14 32 32s-14 32-32 32h-10l-8 23c-16 45-41 87-72 122 14 9 29 17 44 24l51 22-26 59-51-23c-23-10-45-22-66-36-21 17-44 32-69 44l-35 18c-15 8-35 1-43-15-7-15-1-35 15-43l34-17c17-8 32-18 47-28-14-13-27-27-39-41l-21-24c-11-14-9-34 5-46 13-11 33-9 45 5l20 24c11 14 24 27 37 39 28-31 50-66 64-106v-1H42c-18 0-32-14-32-32s14-32 32-32h96V42c0-18 14-32 32-32z" fill="#1e3050"/></svg>
         </template>
 
         <template #actions>
diff --git a/src/routes/settings/admin/Payments.vue b/src/routes/settings/admin/Payments.vue
index 512e0f4..b852b2b 100644
--- a/src/routes/settings/admin/Payments.vue
+++ b/src/routes/settings/admin/Payments.vue
@@ -7,7 +7,7 @@ import AdminSelect from "./components/AdminSelect.vue";
 import AdminTable from "./components/AdminTable.vue";
 import AdminSectionCard from "./components/AdminSectionCard.vue";
 import PlanSelection from "@/routes/settings/Billing/components/PlanSelection.tsx";
-import type { Plan as ModelPlan } from "@/server/gen/proto/app/v1/common";
+import type { Plan as ModelPlan } from "@/server/api/proto/app/v1/common";
 import { type ColumnDef } from "@tanstack/vue-table";
 import { computed, h, onMounted, reactive, ref, watch } from "vue";
 import AdminMetricCard from "./components/AdminMetricCard.vue";
diff --git a/src/routes/video/CopyVideoModal.vue b/src/routes/video/CopyVideoModal.vue
index 0f45fa2..4ed1d9e 100644
--- a/src/routes/video/CopyVideoModal.vue
+++ b/src/routes/video/CopyVideoModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { client as rpcClient } from '@/api/rpcclient';
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import { useAppToast } from '@/composables/useAppToast';
 import { computed, ref, watch } from 'vue';
 import { useTranslation } from 'i18next-vue';
diff --git a/src/routes/video/DetailVideoModal.vue b/src/routes/video/DetailVideoModal.vue
index 209419c..6480f4d 100644
--- a/src/routes/video/DetailVideoModal.vue
+++ b/src/routes/video/DetailVideoModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { client as rpcClient } from '@/api/rpcclient';
-import type { AdTemplate as ManualAdTemplate, Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { AdTemplate as ManualAdTemplate, Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import { useAppToast } from '@/composables/useAppToast';
 import { useAuthStore } from '@/stores/auth';
 import { computed, ref, watch } from 'vue';
diff --git a/src/routes/video/Videos.vue b/src/routes/video/Videos.vue
index 130f22f..93939f0 100644
--- a/src/routes/video/Videos.vue
+++ b/src/routes/video/Videos.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { client as rpcClient } from '@/api/rpcclient';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import EmptyState from '@/components/dashboard/EmptyState.vue';
 import PageHeader from '@/components/dashboard/PageHeader.vue';
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
 import { useTranslation } from 'i18next-vue';
 import { computed, createStaticVNode, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
diff --git a/src/routes/video/components/VideoBulkActions.vue b/src/routes/video/components/VideoBulkActions.vue
index 10d98f1..0ae6825 100644
--- a/src/routes/video/components/VideoBulkActions.vue
+++ b/src/routes/video/components/VideoBulkActions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import { useTranslation } from 'i18next-vue';
 
 defineProps<{
diff --git a/src/routes/video/components/VideoTable.vue b/src/routes/video/components/VideoTable.vue
index a8a55e7..f58a382 100644
--- a/src/routes/video/components/VideoTable.vue
+++ b/src/routes/video/components/VideoTable.vue
@@ -5,7 +5,7 @@ import TrashIcon from '@/components/icons/TrashIcon.vue';
 import VideoIcon from '@/components/icons/VideoIcon.vue';
 import BaseTable from '@/components/ui/BaseTable.vue';
 import { formatBytes, formatDate, getStatusSeverity } from '@/lib/utils';
-import type { Video as ModelVideo } from '@/server/gen/proto/app/v1/common';
+import type { Video as ModelVideo } from '@/server/api/proto/app/v1/common';
 import type { ColumnDef } from '@tanstack/vue-table';
 import { useTranslation } from 'i18next-vue';
 import { computed, h } from 'vue';
diff --git a/src/server/api/proto/agent/v1/woodpecker.ts b/src/server/api/proto/agent/v1/woodpecker.ts
new file mode 100644
index 0000000..263eb00
--- /dev/null
+++ b/src/server/api/proto/agent/v1/woodpecker.ts
@@ -0,0 +1,2734 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.4
+//   protoc               unknown
+// source: agent/v1/woodpecker.proto
+
+/* eslint-disable */
+import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
+import {
+  type CallOptions,
+  type ChannelCredentials,
+  Client,
+  type ClientOptions,
+  type ClientReadableStream,
+  type ClientUnaryCall,
+  type ClientWritableStream,
+  type handleClientStreamingCall,
+  type handleServerStreamingCall,
+  type handleUnaryCall,
+  makeGenericClientConstructor,
+  type Metadata,
+  type ServiceError,
+  type UntypedServiceImplementation,
+} from "@grpc/grpc-js";
+
+export const protobufPackage = "proto";
+
+export interface StepState {
+  stepUuid?: string | undefined;
+  started?: number | undefined;
+  finished?: number | undefined;
+  exited?: boolean | undefined;
+  exitCode?: number | undefined;
+  error?: string | undefined;
+  canceled?: boolean | undefined;
+}
+
+export interface WorkflowState {
+  started?: number | undefined;
+  finished?: number | undefined;
+  error?: string | undefined;
+  canceled?: boolean | undefined;
+}
+
+export interface LogEntry {
+  stepUuid?: string | undefined;
+  time?: number | undefined;
+  line?:
+    | number
+    | undefined;
+  /** 0 = stdout, 1 = stderr, 2 = exit-code, 3 = metadata, 4 = progress */
+  type?: number | undefined;
+  data?: Buffer | undefined;
+}
+
+export interface Filter {
+  labels?: { [key: string]: string } | undefined;
+}
+
+export interface Filter_LabelsEntry {
+  key: string;
+  value: string;
+}
+
+export interface Workflow {
+  id?: string | undefined;
+  timeout?: number | undefined;
+  payload?: Buffer | undefined;
+  cancel?: boolean | undefined;
+}
+
+export interface NextRequest {
+  filter?: Filter | undefined;
+}
+
+export interface InitRequest {
+  id?: string | undefined;
+  state?: WorkflowState | undefined;
+}
+
+export interface WaitRequest {
+  id?: string | undefined;
+}
+
+export interface DoneRequest {
+  id?: string | undefined;
+  state?: WorkflowState | undefined;
+}
+
+export interface ExtendRequest {
+  id?: string | undefined;
+}
+
+export interface UpdateRequest {
+  id?: string | undefined;
+  state?: StepState | undefined;
+}
+
+export interface LogRequest {
+  logEntries?: LogEntry[] | undefined;
+}
+
+export interface Empty {
+}
+
+export interface ReportHealthRequest {
+  status?: string | undefined;
+}
+
+export interface AgentInfo {
+  platform?: string | undefined;
+  capacity?: number | undefined;
+  backend?: string | undefined;
+  version?: string | undefined;
+  customLabels?: { [key: string]: string } | undefined;
+}
+
+export interface AgentInfo_CustomLabelsEntry {
+  key: string;
+  value: string;
+}
+
+export interface RegisterAgentRequest {
+  info?: AgentInfo | undefined;
+}
+
+export interface VersionResponse {
+  grpcVersion?: number | undefined;
+  serverVersion?: string | undefined;
+}
+
+export interface NextResponse {
+  workflow?: Workflow | undefined;
+}
+
+export interface RegisterAgentResponse {
+  agentId?: string | undefined;
+}
+
+export interface WaitResponse {
+  canceled?: boolean | undefined;
+}
+
+export interface AuthRequest {
+  agentToken?: string | undefined;
+  agentId?: string | undefined;
+  hostname?: string | undefined;
+}
+
+export interface AuthResponse {
+  status?: string | undefined;
+  agentId?: string | undefined;
+  accessToken?: string | undefined;
+}
+
+export interface StreamOptions {
+  filter?: Filter | undefined;
+}
+
+export interface StatusUpdate {
+  stepUuid?: string | undefined;
+  time?:
+    | number
+    | undefined;
+  /** 0=stdout, 1=stderr, 2=exit-code, 3=metadata, 4=progress, 5=system-resource */
+  type?: number | undefined;
+  data?: Buffer | undefined;
+}
+
+function createBaseStepState(): StepState {
+  return { stepUuid: "", started: 0, finished: 0, exited: false, exitCode: 0, error: "", canceled: false };
+}
+
+export const StepState: MessageFns<StepState> = {
+  encode(message: StepState, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      writer.uint32(10).string(message.stepUuid);
+    }
+    if (message.started !== undefined && message.started !== 0) {
+      writer.uint32(16).int64(message.started);
+    }
+    if (message.finished !== undefined && message.finished !== 0) {
+      writer.uint32(24).int64(message.finished);
+    }
+    if (message.exited !== undefined && message.exited !== false) {
+      writer.uint32(32).bool(message.exited);
+    }
+    if (message.exitCode !== undefined && message.exitCode !== 0) {
+      writer.uint32(40).int32(message.exitCode);
+    }
+    if (message.error !== undefined && message.error !== "") {
+      writer.uint32(50).string(message.error);
+    }
+    if (message.canceled !== undefined && message.canceled !== false) {
+      writer.uint32(56).bool(message.canceled);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): StepState {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseStepState();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.stepUuid = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.started = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+
+          message.finished = longToNumber(reader.int64());
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+
+          message.exited = reader.bool();
+          continue;
+        }
+        case 5: {
+          if (tag !== 40) {
+            break;
+          }
+
+          message.exitCode = reader.int32();
+          continue;
+        }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+
+          message.error = reader.string();
+          continue;
+        }
+        case 7: {
+          if (tag !== 56) {
+            break;
+          }
+
+          message.canceled = reader.bool();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): StepState {
+    return {
+      stepUuid: isSet(object.stepUuid)
+        ? globalThis.String(object.stepUuid)
+        : isSet(object.step_uuid)
+        ? globalThis.String(object.step_uuid)
+        : "",
+      started: isSet(object.started) ? globalThis.Number(object.started) : 0,
+      finished: isSet(object.finished) ? globalThis.Number(object.finished) : 0,
+      exited: isSet(object.exited) ? globalThis.Boolean(object.exited) : false,
+      exitCode: isSet(object.exitCode)
+        ? globalThis.Number(object.exitCode)
+        : isSet(object.exit_code)
+        ? globalThis.Number(object.exit_code)
+        : 0,
+      error: isSet(object.error) ? globalThis.String(object.error) : "",
+      canceled: isSet(object.canceled) ? globalThis.Boolean(object.canceled) : false,
+    };
+  },
+
+  toJSON(message: StepState): unknown {
+    const obj: any = {};
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      obj.stepUuid = message.stepUuid;
+    }
+    if (message.started !== undefined && message.started !== 0) {
+      obj.started = Math.round(message.started);
+    }
+    if (message.finished !== undefined && message.finished !== 0) {
+      obj.finished = Math.round(message.finished);
+    }
+    if (message.exited !== undefined && message.exited !== false) {
+      obj.exited = message.exited;
+    }
+    if (message.exitCode !== undefined && message.exitCode !== 0) {
+      obj.exitCode = Math.round(message.exitCode);
+    }
+    if (message.error !== undefined && message.error !== "") {
+      obj.error = message.error;
+    }
+    if (message.canceled !== undefined && message.canceled !== false) {
+      obj.canceled = message.canceled;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<StepState>, I>>(base?: I): StepState {
+    return StepState.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<StepState>, I>>(object: I): StepState {
+    const message = createBaseStepState();
+    message.stepUuid = object.stepUuid ?? "";
+    message.started = object.started ?? 0;
+    message.finished = object.finished ?? 0;
+    message.exited = object.exited ?? false;
+    message.exitCode = object.exitCode ?? 0;
+    message.error = object.error ?? "";
+    message.canceled = object.canceled ?? false;
+    return message;
+  },
+};
+
+function createBaseWorkflowState(): WorkflowState {
+  return { started: 0, finished: 0, error: "", canceled: false };
+}
+
+export const WorkflowState: MessageFns<WorkflowState> = {
+  encode(message: WorkflowState, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.started !== undefined && message.started !== 0) {
+      writer.uint32(8).int64(message.started);
+    }
+    if (message.finished !== undefined && message.finished !== 0) {
+      writer.uint32(16).int64(message.finished);
+    }
+    if (message.error !== undefined && message.error !== "") {
+      writer.uint32(26).string(message.error);
+    }
+    if (message.canceled !== undefined && message.canceled !== false) {
+      writer.uint32(32).bool(message.canceled);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): WorkflowState {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseWorkflowState();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.started = longToNumber(reader.int64());
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.finished = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.error = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+
+          message.canceled = reader.bool();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): WorkflowState {
+    return {
+      started: isSet(object.started) ? globalThis.Number(object.started) : 0,
+      finished: isSet(object.finished) ? globalThis.Number(object.finished) : 0,
+      error: isSet(object.error) ? globalThis.String(object.error) : "",
+      canceled: isSet(object.canceled) ? globalThis.Boolean(object.canceled) : false,
+    };
+  },
+
+  toJSON(message: WorkflowState): unknown {
+    const obj: any = {};
+    if (message.started !== undefined && message.started !== 0) {
+      obj.started = Math.round(message.started);
+    }
+    if (message.finished !== undefined && message.finished !== 0) {
+      obj.finished = Math.round(message.finished);
+    }
+    if (message.error !== undefined && message.error !== "") {
+      obj.error = message.error;
+    }
+    if (message.canceled !== undefined && message.canceled !== false) {
+      obj.canceled = message.canceled;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<WorkflowState>, I>>(base?: I): WorkflowState {
+    return WorkflowState.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<WorkflowState>, I>>(object: I): WorkflowState {
+    const message = createBaseWorkflowState();
+    message.started = object.started ?? 0;
+    message.finished = object.finished ?? 0;
+    message.error = object.error ?? "";
+    message.canceled = object.canceled ?? false;
+    return message;
+  },
+};
+
+function createBaseLogEntry(): LogEntry {
+  return { stepUuid: "", time: 0, line: 0, type: 0, data: Buffer.alloc(0) };
+}
+
+export const LogEntry: MessageFns<LogEntry> = {
+  encode(message: LogEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      writer.uint32(10).string(message.stepUuid);
+    }
+    if (message.time !== undefined && message.time !== 0) {
+      writer.uint32(16).int64(message.time);
+    }
+    if (message.line !== undefined && message.line !== 0) {
+      writer.uint32(24).int32(message.line);
+    }
+    if (message.type !== undefined && message.type !== 0) {
+      writer.uint32(32).int32(message.type);
+    }
+    if (message.data !== undefined && message.data.length !== 0) {
+      writer.uint32(42).bytes(message.data);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): LogEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseLogEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.stepUuid = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.time = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+
+          message.line = reader.int32();
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+
+          message.type = reader.int32();
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+
+          message.data = Buffer.from(reader.bytes());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): LogEntry {
+    return {
+      stepUuid: isSet(object.stepUuid)
+        ? globalThis.String(object.stepUuid)
+        : isSet(object.step_uuid)
+        ? globalThis.String(object.step_uuid)
+        : "",
+      time: isSet(object.time) ? globalThis.Number(object.time) : 0,
+      line: isSet(object.line) ? globalThis.Number(object.line) : 0,
+      type: isSet(object.type) ? globalThis.Number(object.type) : 0,
+      data: isSet(object.data) ? Buffer.from(bytesFromBase64(object.data)) : Buffer.alloc(0),
+    };
+  },
+
+  toJSON(message: LogEntry): unknown {
+    const obj: any = {};
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      obj.stepUuid = message.stepUuid;
+    }
+    if (message.time !== undefined && message.time !== 0) {
+      obj.time = Math.round(message.time);
+    }
+    if (message.line !== undefined && message.line !== 0) {
+      obj.line = Math.round(message.line);
+    }
+    if (message.type !== undefined && message.type !== 0) {
+      obj.type = Math.round(message.type);
+    }
+    if (message.data !== undefined && message.data.length !== 0) {
+      obj.data = base64FromBytes(message.data);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<LogEntry>, I>>(base?: I): LogEntry {
+    return LogEntry.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<LogEntry>, I>>(object: I): LogEntry {
+    const message = createBaseLogEntry();
+    message.stepUuid = object.stepUuid ?? "";
+    message.time = object.time ?? 0;
+    message.line = object.line ?? 0;
+    message.type = object.type ?? 0;
+    message.data = object.data ?? Buffer.alloc(0);
+    return message;
+  },
+};
+
+function createBaseFilter(): Filter {
+  return { labels: {} };
+}
+
+export const Filter: MessageFns<Filter> = {
+  encode(message: Filter, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    globalThis.Object.entries(message.labels || {}).forEach(([key, value]: [string, string]) => {
+      Filter_LabelsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join();
+    });
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Filter {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseFilter();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          const entry1 = Filter_LabelsEntry.decode(reader, reader.uint32());
+          if (entry1.value !== undefined) {
+            message.labels![entry1.key] = entry1.value;
+          }
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Filter {
+    return {
+      labels: isObject(object.labels)
+        ? (globalThis.Object.entries(object.labels) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : {},
+    };
+  },
+
+  toJSON(message: Filter): unknown {
+    const obj: any = {};
+    if (message.labels) {
+      const entries = globalThis.Object.entries(message.labels) as [string, string][];
+      if (entries.length > 0) {
+        obj.labels = {};
+        entries.forEach(([k, v]) => {
+          obj.labels[k] = v;
+        });
+      }
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Filter>, I>>(base?: I): Filter {
+    return Filter.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Filter>, I>>(object: I): Filter {
+    const message = createBaseFilter();
+    message.labels = (globalThis.Object.entries(object.labels ?? {}) as [string, string][]).reduce(
+      (acc: { [key: string]: string }, [key, value]: [string, string]) => {
+        if (value !== undefined) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {},
+    );
+    return message;
+  },
+};
+
+function createBaseFilter_LabelsEntry(): Filter_LabelsEntry {
+  return { key: "", value: "" };
+}
+
+export const Filter_LabelsEntry: MessageFns<Filter_LabelsEntry> = {
+  encode(message: Filter_LabelsEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Filter_LabelsEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseFilter_LabelsEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Filter_LabelsEntry {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      value: isSet(object.value) ? globalThis.String(object.value) : "",
+    };
+  },
+
+  toJSON(message: Filter_LabelsEntry): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Filter_LabelsEntry>, I>>(base?: I): Filter_LabelsEntry {
+    return Filter_LabelsEntry.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Filter_LabelsEntry>, I>>(object: I): Filter_LabelsEntry {
+    const message = createBaseFilter_LabelsEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  },
+};
+
+function createBaseWorkflow(): Workflow {
+  return { id: "", timeout: 0, payload: Buffer.alloc(0), cancel: false };
+}
+
+export const Workflow: MessageFns<Workflow> = {
+  encode(message: Workflow, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.timeout !== undefined && message.timeout !== 0) {
+      writer.uint32(16).int64(message.timeout);
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      writer.uint32(26).bytes(message.payload);
+    }
+    if (message.cancel !== undefined && message.cancel !== false) {
+      writer.uint32(32).bool(message.cancel);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Workflow {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseWorkflow();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.timeout = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.payload = Buffer.from(reader.bytes());
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+
+          message.cancel = reader.bool();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Workflow {
+    return {
+      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      timeout: isSet(object.timeout) ? globalThis.Number(object.timeout) : 0,
+      payload: isSet(object.payload) ? Buffer.from(bytesFromBase64(object.payload)) : Buffer.alloc(0),
+      cancel: isSet(object.cancel) ? globalThis.Boolean(object.cancel) : false,
+    };
+  },
+
+  toJSON(message: Workflow): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    if (message.timeout !== undefined && message.timeout !== 0) {
+      obj.timeout = Math.round(message.timeout);
+    }
+    if (message.payload !== undefined && message.payload.length !== 0) {
+      obj.payload = base64FromBytes(message.payload);
+    }
+    if (message.cancel !== undefined && message.cancel !== false) {
+      obj.cancel = message.cancel;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Workflow>, I>>(base?: I): Workflow {
+    return Workflow.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Workflow>, I>>(object: I): Workflow {
+    const message = createBaseWorkflow();
+    message.id = object.id ?? "";
+    message.timeout = object.timeout ?? 0;
+    message.payload = object.payload ?? Buffer.alloc(0);
+    message.cancel = object.cancel ?? false;
+    return message;
+  },
+};
+
+function createBaseNextRequest(): NextRequest {
+  return { filter: undefined };
+}
+
+export const NextRequest: MessageFns<NextRequest> = {
+  encode(message: NextRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.filter !== undefined) {
+      Filter.encode(message.filter, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): NextRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseNextRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.filter = Filter.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): NextRequest {
+    return { filter: isSet(object.filter) ? Filter.fromJSON(object.filter) : undefined };
+  },
+
+  toJSON(message: NextRequest): unknown {
+    const obj: any = {};
+    if (message.filter !== undefined) {
+      obj.filter = Filter.toJSON(message.filter);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<NextRequest>, I>>(base?: I): NextRequest {
+    return NextRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<NextRequest>, I>>(object: I): NextRequest {
+    const message = createBaseNextRequest();
+    message.filter = (object.filter !== undefined && object.filter !== null)
+      ? Filter.fromPartial(object.filter)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseInitRequest(): InitRequest {
+  return { id: "", state: undefined };
+}
+
+export const InitRequest: MessageFns<InitRequest> = {
+  encode(message: InitRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.state !== undefined) {
+      WorkflowState.encode(message.state, writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): InitRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseInitRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.state = WorkflowState.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): InitRequest {
+    return {
+      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      state: isSet(object.state) ? WorkflowState.fromJSON(object.state) : undefined,
+    };
+  },
+
+  toJSON(message: InitRequest): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    if (message.state !== undefined) {
+      obj.state = WorkflowState.toJSON(message.state);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<InitRequest>, I>>(base?: I): InitRequest {
+    return InitRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<InitRequest>, I>>(object: I): InitRequest {
+    const message = createBaseInitRequest();
+    message.id = object.id ?? "";
+    message.state = (object.state !== undefined && object.state !== null)
+      ? WorkflowState.fromPartial(object.state)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseWaitRequest(): WaitRequest {
+  return { id: "" };
+}
+
+export const WaitRequest: MessageFns<WaitRequest> = {
+  encode(message: WaitRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): WaitRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseWaitRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): WaitRequest {
+    return { id: isSet(object.id) ? globalThis.String(object.id) : "" };
+  },
+
+  toJSON(message: WaitRequest): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<WaitRequest>, I>>(base?: I): WaitRequest {
+    return WaitRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<WaitRequest>, I>>(object: I): WaitRequest {
+    const message = createBaseWaitRequest();
+    message.id = object.id ?? "";
+    return message;
+  },
+};
+
+function createBaseDoneRequest(): DoneRequest {
+  return { id: "", state: undefined };
+}
+
+export const DoneRequest: MessageFns<DoneRequest> = {
+  encode(message: DoneRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.state !== undefined) {
+      WorkflowState.encode(message.state, writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): DoneRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseDoneRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.state = WorkflowState.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): DoneRequest {
+    return {
+      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      state: isSet(object.state) ? WorkflowState.fromJSON(object.state) : undefined,
+    };
+  },
+
+  toJSON(message: DoneRequest): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    if (message.state !== undefined) {
+      obj.state = WorkflowState.toJSON(message.state);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DoneRequest>, I>>(base?: I): DoneRequest {
+    return DoneRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<DoneRequest>, I>>(object: I): DoneRequest {
+    const message = createBaseDoneRequest();
+    message.id = object.id ?? "";
+    message.state = (object.state !== undefined && object.state !== null)
+      ? WorkflowState.fromPartial(object.state)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseExtendRequest(): ExtendRequest {
+  return { id: "" };
+}
+
+export const ExtendRequest: MessageFns<ExtendRequest> = {
+  encode(message: ExtendRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): ExtendRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseExtendRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ExtendRequest {
+    return { id: isSet(object.id) ? globalThis.String(object.id) : "" };
+  },
+
+  toJSON(message: ExtendRequest): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ExtendRequest>, I>>(base?: I): ExtendRequest {
+    return ExtendRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<ExtendRequest>, I>>(object: I): ExtendRequest {
+    const message = createBaseExtendRequest();
+    message.id = object.id ?? "";
+    return message;
+  },
+};
+
+function createBaseUpdateRequest(): UpdateRequest {
+  return { id: "", state: undefined };
+}
+
+export const UpdateRequest: MessageFns<UpdateRequest> = {
+  encode(message: UpdateRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== undefined && message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.state !== undefined) {
+      StepState.encode(message.state, writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): UpdateRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseUpdateRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.state = StepState.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): UpdateRequest {
+    return {
+      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      state: isSet(object.state) ? StepState.fromJSON(object.state) : undefined,
+    };
+  },
+
+  toJSON(message: UpdateRequest): unknown {
+    const obj: any = {};
+    if (message.id !== undefined && message.id !== "") {
+      obj.id = message.id;
+    }
+    if (message.state !== undefined) {
+      obj.state = StepState.toJSON(message.state);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<UpdateRequest>, I>>(base?: I): UpdateRequest {
+    return UpdateRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<UpdateRequest>, I>>(object: I): UpdateRequest {
+    const message = createBaseUpdateRequest();
+    message.id = object.id ?? "";
+    message.state = (object.state !== undefined && object.state !== null)
+      ? StepState.fromPartial(object.state)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseLogRequest(): LogRequest {
+  return { logEntries: [] };
+}
+
+export const LogRequest: MessageFns<LogRequest> = {
+  encode(message: LogRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.logEntries !== undefined && message.logEntries.length !== 0) {
+      for (const v of message.logEntries) {
+        LogEntry.encode(v!, writer.uint32(10).fork()).join();
+      }
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): LogRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseLogRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          const el = LogEntry.decode(reader, reader.uint32());
+          if (el !== undefined) {
+            message.logEntries!.push(el);
+          }
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): LogRequest {
+    return {
+      logEntries: globalThis.Array.isArray(object?.logEntries)
+        ? object.logEntries.map((e: any) => LogEntry.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: LogRequest): unknown {
+    const obj: any = {};
+    if (message.logEntries?.length) {
+      obj.logEntries = message.logEntries.map((e) => LogEntry.toJSON(e));
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<LogRequest>, I>>(base?: I): LogRequest {
+    return LogRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<LogRequest>, I>>(object: I): LogRequest {
+    const message = createBaseLogRequest();
+    message.logEntries = object.logEntries?.map((e) => LogEntry.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseEmpty(): Empty {
+  return {};
+}
+
+export const Empty: MessageFns<Empty> = {
+  encode(_: Empty, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Empty {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseEmpty();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): Empty {
+    return {};
+  },
+
+  toJSON(_: Empty): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Empty>, I>>(base?: I): Empty {
+    return Empty.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Empty>, I>>(_: I): Empty {
+    const message = createBaseEmpty();
+    return message;
+  },
+};
+
+function createBaseReportHealthRequest(): ReportHealthRequest {
+  return { status: "" };
+}
+
+export const ReportHealthRequest: MessageFns<ReportHealthRequest> = {
+  encode(message: ReportHealthRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.status !== undefined && message.status !== "") {
+      writer.uint32(10).string(message.status);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): ReportHealthRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseReportHealthRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.status = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ReportHealthRequest {
+    return { status: isSet(object.status) ? globalThis.String(object.status) : "" };
+  },
+
+  toJSON(message: ReportHealthRequest): unknown {
+    const obj: any = {};
+    if (message.status !== undefined && message.status !== "") {
+      obj.status = message.status;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ReportHealthRequest>, I>>(base?: I): ReportHealthRequest {
+    return ReportHealthRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<ReportHealthRequest>, I>>(object: I): ReportHealthRequest {
+    const message = createBaseReportHealthRequest();
+    message.status = object.status ?? "";
+    return message;
+  },
+};
+
+function createBaseAgentInfo(): AgentInfo {
+  return { platform: "", capacity: 0, backend: "", version: "", customLabels: {} };
+}
+
+export const AgentInfo: MessageFns<AgentInfo> = {
+  encode(message: AgentInfo, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.platform !== undefined && message.platform !== "") {
+      writer.uint32(10).string(message.platform);
+    }
+    if (message.capacity !== undefined && message.capacity !== 0) {
+      writer.uint32(16).int32(message.capacity);
+    }
+    if (message.backend !== undefined && message.backend !== "") {
+      writer.uint32(26).string(message.backend);
+    }
+    if (message.version !== undefined && message.version !== "") {
+      writer.uint32(34).string(message.version);
+    }
+    globalThis.Object.entries(message.customLabels || {}).forEach(([key, value]: [string, string]) => {
+      AgentInfo_CustomLabelsEntry.encode({ key: key as any, value }, writer.uint32(42).fork()).join();
+    });
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AgentInfo {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAgentInfo();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.platform = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.capacity = reader.int32();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.backend = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+
+          message.version = reader.string();
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+
+          const entry5 = AgentInfo_CustomLabelsEntry.decode(reader, reader.uint32());
+          if (entry5.value !== undefined) {
+            message.customLabels![entry5.key] = entry5.value;
+          }
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AgentInfo {
+    return {
+      platform: isSet(object.platform) ? globalThis.String(object.platform) : "",
+      capacity: isSet(object.capacity) ? globalThis.Number(object.capacity) : 0,
+      backend: isSet(object.backend) ? globalThis.String(object.backend) : "",
+      version: isSet(object.version) ? globalThis.String(object.version) : "",
+      customLabels: isObject(object.customLabels)
+        ? (globalThis.Object.entries(object.customLabels) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : {},
+    };
+  },
+
+  toJSON(message: AgentInfo): unknown {
+    const obj: any = {};
+    if (message.platform !== undefined && message.platform !== "") {
+      obj.platform = message.platform;
+    }
+    if (message.capacity !== undefined && message.capacity !== 0) {
+      obj.capacity = Math.round(message.capacity);
+    }
+    if (message.backend !== undefined && message.backend !== "") {
+      obj.backend = message.backend;
+    }
+    if (message.version !== undefined && message.version !== "") {
+      obj.version = message.version;
+    }
+    if (message.customLabels) {
+      const entries = globalThis.Object.entries(message.customLabels) as [string, string][];
+      if (entries.length > 0) {
+        obj.customLabels = {};
+        entries.forEach(([k, v]) => {
+          obj.customLabels[k] = v;
+        });
+      }
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AgentInfo>, I>>(base?: I): AgentInfo {
+    return AgentInfo.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AgentInfo>, I>>(object: I): AgentInfo {
+    const message = createBaseAgentInfo();
+    message.platform = object.platform ?? "";
+    message.capacity = object.capacity ?? 0;
+    message.backend = object.backend ?? "";
+    message.version = object.version ?? "";
+    message.customLabels = (globalThis.Object.entries(object.customLabels ?? {}) as [string, string][]).reduce(
+      (acc: { [key: string]: string }, [key, value]: [string, string]) => {
+        if (value !== undefined) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {},
+    );
+    return message;
+  },
+};
+
+function createBaseAgentInfo_CustomLabelsEntry(): AgentInfo_CustomLabelsEntry {
+  return { key: "", value: "" };
+}
+
+export const AgentInfo_CustomLabelsEntry: MessageFns<AgentInfo_CustomLabelsEntry> = {
+  encode(message: AgentInfo_CustomLabelsEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AgentInfo_CustomLabelsEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAgentInfo_CustomLabelsEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AgentInfo_CustomLabelsEntry {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      value: isSet(object.value) ? globalThis.String(object.value) : "",
+    };
+  },
+
+  toJSON(message: AgentInfo_CustomLabelsEntry): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AgentInfo_CustomLabelsEntry>, I>>(base?: I): AgentInfo_CustomLabelsEntry {
+    return AgentInfo_CustomLabelsEntry.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AgentInfo_CustomLabelsEntry>, I>>(object: I): AgentInfo_CustomLabelsEntry {
+    const message = createBaseAgentInfo_CustomLabelsEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  },
+};
+
+function createBaseRegisterAgentRequest(): RegisterAgentRequest {
+  return { info: undefined };
+}
+
+export const RegisterAgentRequest: MessageFns<RegisterAgentRequest> = {
+  encode(message: RegisterAgentRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.info !== undefined) {
+      AgentInfo.encode(message.info, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): RegisterAgentRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseRegisterAgentRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.info = AgentInfo.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): RegisterAgentRequest {
+    return { info: isSet(object.info) ? AgentInfo.fromJSON(object.info) : undefined };
+  },
+
+  toJSON(message: RegisterAgentRequest): unknown {
+    const obj: any = {};
+    if (message.info !== undefined) {
+      obj.info = AgentInfo.toJSON(message.info);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<RegisterAgentRequest>, I>>(base?: I): RegisterAgentRequest {
+    return RegisterAgentRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<RegisterAgentRequest>, I>>(object: I): RegisterAgentRequest {
+    const message = createBaseRegisterAgentRequest();
+    message.info = (object.info !== undefined && object.info !== null) ? AgentInfo.fromPartial(object.info) : undefined;
+    return message;
+  },
+};
+
+function createBaseVersionResponse(): VersionResponse {
+  return { grpcVersion: 0, serverVersion: "" };
+}
+
+export const VersionResponse: MessageFns<VersionResponse> = {
+  encode(message: VersionResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.grpcVersion !== undefined && message.grpcVersion !== 0) {
+      writer.uint32(8).int32(message.grpcVersion);
+    }
+    if (message.serverVersion !== undefined && message.serverVersion !== "") {
+      writer.uint32(18).string(message.serverVersion);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): VersionResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseVersionResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.grpcVersion = reader.int32();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.serverVersion = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): VersionResponse {
+    return {
+      grpcVersion: isSet(object.grpcVersion)
+        ? globalThis.Number(object.grpcVersion)
+        : isSet(object.grpc_version)
+        ? globalThis.Number(object.grpc_version)
+        : 0,
+      serverVersion: isSet(object.serverVersion)
+        ? globalThis.String(object.serverVersion)
+        : isSet(object.server_version)
+        ? globalThis.String(object.server_version)
+        : "",
+    };
+  },
+
+  toJSON(message: VersionResponse): unknown {
+    const obj: any = {};
+    if (message.grpcVersion !== undefined && message.grpcVersion !== 0) {
+      obj.grpcVersion = Math.round(message.grpcVersion);
+    }
+    if (message.serverVersion !== undefined && message.serverVersion !== "") {
+      obj.serverVersion = message.serverVersion;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<VersionResponse>, I>>(base?: I): VersionResponse {
+    return VersionResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<VersionResponse>, I>>(object: I): VersionResponse {
+    const message = createBaseVersionResponse();
+    message.grpcVersion = object.grpcVersion ?? 0;
+    message.serverVersion = object.serverVersion ?? "";
+    return message;
+  },
+};
+
+function createBaseNextResponse(): NextResponse {
+  return { workflow: undefined };
+}
+
+export const NextResponse: MessageFns<NextResponse> = {
+  encode(message: NextResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.workflow !== undefined) {
+      Workflow.encode(message.workflow, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): NextResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseNextResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.workflow = Workflow.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): NextResponse {
+    return { workflow: isSet(object.workflow) ? Workflow.fromJSON(object.workflow) : undefined };
+  },
+
+  toJSON(message: NextResponse): unknown {
+    const obj: any = {};
+    if (message.workflow !== undefined) {
+      obj.workflow = Workflow.toJSON(message.workflow);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<NextResponse>, I>>(base?: I): NextResponse {
+    return NextResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<NextResponse>, I>>(object: I): NextResponse {
+    const message = createBaseNextResponse();
+    message.workflow = (object.workflow !== undefined && object.workflow !== null)
+      ? Workflow.fromPartial(object.workflow)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseRegisterAgentResponse(): RegisterAgentResponse {
+  return { agentId: "" };
+}
+
+export const RegisterAgentResponse: MessageFns<RegisterAgentResponse> = {
+  encode(message: RegisterAgentResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.agentId !== undefined && message.agentId !== "") {
+      writer.uint32(10).string(message.agentId);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): RegisterAgentResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseRegisterAgentResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.agentId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): RegisterAgentResponse {
+    return {
+      agentId: isSet(object.agentId)
+        ? globalThis.String(object.agentId)
+        : isSet(object.agent_id)
+        ? globalThis.String(object.agent_id)
+        : "",
+    };
+  },
+
+  toJSON(message: RegisterAgentResponse): unknown {
+    const obj: any = {};
+    if (message.agentId !== undefined && message.agentId !== "") {
+      obj.agentId = message.agentId;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<RegisterAgentResponse>, I>>(base?: I): RegisterAgentResponse {
+    return RegisterAgentResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<RegisterAgentResponse>, I>>(object: I): RegisterAgentResponse {
+    const message = createBaseRegisterAgentResponse();
+    message.agentId = object.agentId ?? "";
+    return message;
+  },
+};
+
+function createBaseWaitResponse(): WaitResponse {
+  return { canceled: false };
+}
+
+export const WaitResponse: MessageFns<WaitResponse> = {
+  encode(message: WaitResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.canceled !== undefined && message.canceled !== false) {
+      writer.uint32(8).bool(message.canceled);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): WaitResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseWaitResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.canceled = reader.bool();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): WaitResponse {
+    return { canceled: isSet(object.canceled) ? globalThis.Boolean(object.canceled) : false };
+  },
+
+  toJSON(message: WaitResponse): unknown {
+    const obj: any = {};
+    if (message.canceled !== undefined && message.canceled !== false) {
+      obj.canceled = message.canceled;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<WaitResponse>, I>>(base?: I): WaitResponse {
+    return WaitResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<WaitResponse>, I>>(object: I): WaitResponse {
+    const message = createBaseWaitResponse();
+    message.canceled = object.canceled ?? false;
+    return message;
+  },
+};
+
+function createBaseAuthRequest(): AuthRequest {
+  return { agentToken: "", agentId: "", hostname: "" };
+}
+
+export const AuthRequest: MessageFns<AuthRequest> = {
+  encode(message: AuthRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.agentToken !== undefined && message.agentToken !== "") {
+      writer.uint32(10).string(message.agentToken);
+    }
+    if (message.agentId !== undefined && message.agentId !== "") {
+      writer.uint32(18).string(message.agentId);
+    }
+    if (message.hostname !== undefined && message.hostname !== "") {
+      writer.uint32(26).string(message.hostname);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AuthRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAuthRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.agentToken = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.agentId = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.hostname = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AuthRequest {
+    return {
+      agentToken: isSet(object.agentToken)
+        ? globalThis.String(object.agentToken)
+        : isSet(object.agent_token)
+        ? globalThis.String(object.agent_token)
+        : "",
+      agentId: isSet(object.agentId)
+        ? globalThis.String(object.agentId)
+        : isSet(object.agent_id)
+        ? globalThis.String(object.agent_id)
+        : "",
+      hostname: isSet(object.hostname) ? globalThis.String(object.hostname) : "",
+    };
+  },
+
+  toJSON(message: AuthRequest): unknown {
+    const obj: any = {};
+    if (message.agentToken !== undefined && message.agentToken !== "") {
+      obj.agentToken = message.agentToken;
+    }
+    if (message.agentId !== undefined && message.agentId !== "") {
+      obj.agentId = message.agentId;
+    }
+    if (message.hostname !== undefined && message.hostname !== "") {
+      obj.hostname = message.hostname;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AuthRequest>, I>>(base?: I): AuthRequest {
+    return AuthRequest.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AuthRequest>, I>>(object: I): AuthRequest {
+    const message = createBaseAuthRequest();
+    message.agentToken = object.agentToken ?? "";
+    message.agentId = object.agentId ?? "";
+    message.hostname = object.hostname ?? "";
+    return message;
+  },
+};
+
+function createBaseAuthResponse(): AuthResponse {
+  return { status: "", agentId: "", accessToken: "" };
+}
+
+export const AuthResponse: MessageFns<AuthResponse> = {
+  encode(message: AuthResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.status !== undefined && message.status !== "") {
+      writer.uint32(10).string(message.status);
+    }
+    if (message.agentId !== undefined && message.agentId !== "") {
+      writer.uint32(18).string(message.agentId);
+    }
+    if (message.accessToken !== undefined && message.accessToken !== "") {
+      writer.uint32(26).string(message.accessToken);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AuthResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAuthResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.status = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.agentId = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.accessToken = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AuthResponse {
+    return {
+      status: isSet(object.status) ? globalThis.String(object.status) : "",
+      agentId: isSet(object.agentId)
+        ? globalThis.String(object.agentId)
+        : isSet(object.agent_id)
+        ? globalThis.String(object.agent_id)
+        : "",
+      accessToken: isSet(object.accessToken)
+        ? globalThis.String(object.accessToken)
+        : isSet(object.access_token)
+        ? globalThis.String(object.access_token)
+        : "",
+    };
+  },
+
+  toJSON(message: AuthResponse): unknown {
+    const obj: any = {};
+    if (message.status !== undefined && message.status !== "") {
+      obj.status = message.status;
+    }
+    if (message.agentId !== undefined && message.agentId !== "") {
+      obj.agentId = message.agentId;
+    }
+    if (message.accessToken !== undefined && message.accessToken !== "") {
+      obj.accessToken = message.accessToken;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AuthResponse>, I>>(base?: I): AuthResponse {
+    return AuthResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AuthResponse>, I>>(object: I): AuthResponse {
+    const message = createBaseAuthResponse();
+    message.status = object.status ?? "";
+    message.agentId = object.agentId ?? "";
+    message.accessToken = object.accessToken ?? "";
+    return message;
+  },
+};
+
+function createBaseStreamOptions(): StreamOptions {
+  return { filter: undefined };
+}
+
+export const StreamOptions: MessageFns<StreamOptions> = {
+  encode(message: StreamOptions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.filter !== undefined) {
+      Filter.encode(message.filter, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): StreamOptions {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseStreamOptions();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.filter = Filter.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): StreamOptions {
+    return { filter: isSet(object.filter) ? Filter.fromJSON(object.filter) : undefined };
+  },
+
+  toJSON(message: StreamOptions): unknown {
+    const obj: any = {};
+    if (message.filter !== undefined) {
+      obj.filter = Filter.toJSON(message.filter);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<StreamOptions>, I>>(base?: I): StreamOptions {
+    return StreamOptions.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<StreamOptions>, I>>(object: I): StreamOptions {
+    const message = createBaseStreamOptions();
+    message.filter = (object.filter !== undefined && object.filter !== null)
+      ? Filter.fromPartial(object.filter)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseStatusUpdate(): StatusUpdate {
+  return { stepUuid: "", time: 0, type: 0, data: Buffer.alloc(0) };
+}
+
+export const StatusUpdate: MessageFns<StatusUpdate> = {
+  encode(message: StatusUpdate, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      writer.uint32(10).string(message.stepUuid);
+    }
+    if (message.time !== undefined && message.time !== 0) {
+      writer.uint32(16).int64(message.time);
+    }
+    if (message.type !== undefined && message.type !== 0) {
+      writer.uint32(24).int32(message.type);
+    }
+    if (message.data !== undefined && message.data.length !== 0) {
+      writer.uint32(34).bytes(message.data);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): StatusUpdate {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseStatusUpdate();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.stepUuid = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.time = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+
+          message.type = reader.int32();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+
+          message.data = Buffer.from(reader.bytes());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): StatusUpdate {
+    return {
+      stepUuid: isSet(object.stepUuid)
+        ? globalThis.String(object.stepUuid)
+        : isSet(object.step_uuid)
+        ? globalThis.String(object.step_uuid)
+        : "",
+      time: isSet(object.time) ? globalThis.Number(object.time) : 0,
+      type: isSet(object.type) ? globalThis.Number(object.type) : 0,
+      data: isSet(object.data) ? Buffer.from(bytesFromBase64(object.data)) : Buffer.alloc(0),
+    };
+  },
+
+  toJSON(message: StatusUpdate): unknown {
+    const obj: any = {};
+    if (message.stepUuid !== undefined && message.stepUuid !== "") {
+      obj.stepUuid = message.stepUuid;
+    }
+    if (message.time !== undefined && message.time !== 0) {
+      obj.time = Math.round(message.time);
+    }
+    if (message.type !== undefined && message.type !== 0) {
+      obj.type = Math.round(message.type);
+    }
+    if (message.data !== undefined && message.data.length !== 0) {
+      obj.data = base64FromBytes(message.data);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<StatusUpdate>, I>>(base?: I): StatusUpdate {
+    return StatusUpdate.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<StatusUpdate>, I>>(object: I): StatusUpdate {
+    const message = createBaseStatusUpdate();
+    message.stepUuid = object.stepUuid ?? "";
+    message.time = object.time ?? 0;
+    message.type = object.type ?? 0;
+    message.data = object.data ?? Buffer.alloc(0);
+    return message;
+  },
+};
+
+/** Woodpecker Server Service */
+export type WoodpeckerService = typeof WoodpeckerService;
+export const WoodpeckerService = {
+  version: {
+    path: "/proto.Woodpecker/Version",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    requestDeserialize: (value: Buffer): Empty => Empty.decode(value),
+    responseSerialize: (value: VersionResponse): Buffer => Buffer.from(VersionResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer): VersionResponse => VersionResponse.decode(value),
+  },
+  next: {
+    path: "/proto.Woodpecker/Next",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: NextRequest): Buffer => Buffer.from(NextRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): NextRequest => NextRequest.decode(value),
+    responseSerialize: (value: NextResponse): Buffer => Buffer.from(NextResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer): NextResponse => NextResponse.decode(value),
+  },
+  init: {
+    path: "/proto.Woodpecker/Init",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: InitRequest): Buffer => Buffer.from(InitRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): InitRequest => InitRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  wait: {
+    path: "/proto.Woodpecker/Wait",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: WaitRequest): Buffer => Buffer.from(WaitRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): WaitRequest => WaitRequest.decode(value),
+    responseSerialize: (value: WaitResponse): Buffer => Buffer.from(WaitResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer): WaitResponse => WaitResponse.decode(value),
+  },
+  done: {
+    path: "/proto.Woodpecker/Done",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: DoneRequest): Buffer => Buffer.from(DoneRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): DoneRequest => DoneRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  extend: {
+    path: "/proto.Woodpecker/Extend",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: ExtendRequest): Buffer => Buffer.from(ExtendRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): ExtendRequest => ExtendRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  update: {
+    path: "/proto.Woodpecker/Update",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: UpdateRequest): Buffer => Buffer.from(UpdateRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): UpdateRequest => UpdateRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  log: {
+    path: "/proto.Woodpecker/Log",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: LogRequest): Buffer => Buffer.from(LogRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): LogRequest => LogRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  registerAgent: {
+    path: "/proto.Woodpecker/RegisterAgent",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: RegisterAgentRequest): Buffer => Buffer.from(RegisterAgentRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): RegisterAgentRequest => RegisterAgentRequest.decode(value),
+    responseSerialize: (value: RegisterAgentResponse): Buffer =>
+      Buffer.from(RegisterAgentResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer): RegisterAgentResponse => RegisterAgentResponse.decode(value),
+  },
+  unregisterAgent: {
+    path: "/proto.Woodpecker/UnregisterAgent",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    requestDeserialize: (value: Buffer): Empty => Empty.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  reportHealth: {
+    path: "/proto.Woodpecker/ReportHealth",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: ReportHealthRequest): Buffer => Buffer.from(ReportHealthRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): ReportHealthRequest => ReportHealthRequest.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+  /** New Streaming RPCs */
+  streamJobs: {
+    path: "/proto.Woodpecker/StreamJobs",
+    requestStream: false,
+    responseStream: true,
+    requestSerialize: (value: StreamOptions): Buffer => Buffer.from(StreamOptions.encode(value).finish()),
+    requestDeserialize: (value: Buffer): StreamOptions => StreamOptions.decode(value),
+    responseSerialize: (value: Workflow): Buffer => Buffer.from(Workflow.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Workflow => Workflow.decode(value),
+  },
+  submitStatus: {
+    path: "/proto.Woodpecker/SubmitStatus",
+    requestStream: true,
+    responseStream: false,
+    requestSerialize: (value: StatusUpdate): Buffer => Buffer.from(StatusUpdate.encode(value).finish()),
+    requestDeserialize: (value: Buffer): StatusUpdate => StatusUpdate.decode(value),
+    responseSerialize: (value: Empty): Buffer => Buffer.from(Empty.encode(value).finish()),
+    responseDeserialize: (value: Buffer): Empty => Empty.decode(value),
+  },
+} as const;
+
+export interface WoodpeckerServer extends UntypedServiceImplementation {
+  version: handleUnaryCall<Empty, VersionResponse>;
+  next: handleUnaryCall<NextRequest, NextResponse>;
+  init: handleUnaryCall<InitRequest, Empty>;
+  wait: handleUnaryCall<WaitRequest, WaitResponse>;
+  done: handleUnaryCall<DoneRequest, Empty>;
+  extend: handleUnaryCall<ExtendRequest, Empty>;
+  update: handleUnaryCall<UpdateRequest, Empty>;
+  log: handleUnaryCall<LogRequest, Empty>;
+  registerAgent: handleUnaryCall<RegisterAgentRequest, RegisterAgentResponse>;
+  unregisterAgent: handleUnaryCall<Empty, Empty>;
+  reportHealth: handleUnaryCall<ReportHealthRequest, Empty>;
+  /** New Streaming RPCs */
+  streamJobs: handleServerStreamingCall<StreamOptions, Workflow>;
+  submitStatus: handleClientStreamingCall<StatusUpdate, Empty>;
+}
+
+export interface WoodpeckerClient extends Client {
+  version(request: Empty, callback: (error: ServiceError | null, response: VersionResponse) => void): ClientUnaryCall;
+  version(
+    request: Empty,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: VersionResponse) => void,
+  ): ClientUnaryCall;
+  version(
+    request: Empty,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: VersionResponse) => void,
+  ): ClientUnaryCall;
+  next(request: NextRequest, callback: (error: ServiceError | null, response: NextResponse) => void): ClientUnaryCall;
+  next(
+    request: NextRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: NextResponse) => void,
+  ): ClientUnaryCall;
+  next(
+    request: NextRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: NextResponse) => void,
+  ): ClientUnaryCall;
+  init(request: InitRequest, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  init(
+    request: InitRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  init(
+    request: InitRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  wait(request: WaitRequest, callback: (error: ServiceError | null, response: WaitResponse) => void): ClientUnaryCall;
+  wait(
+    request: WaitRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: WaitResponse) => void,
+  ): ClientUnaryCall;
+  wait(
+    request: WaitRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: WaitResponse) => void,
+  ): ClientUnaryCall;
+  done(request: DoneRequest, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  done(
+    request: DoneRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  done(
+    request: DoneRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  extend(request: ExtendRequest, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  extend(
+    request: ExtendRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  extend(
+    request: ExtendRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  update(request: UpdateRequest, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  update(
+    request: UpdateRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  update(
+    request: UpdateRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  log(request: LogRequest, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  log(
+    request: LogRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  log(
+    request: LogRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  registerAgent(
+    request: RegisterAgentRequest,
+    callback: (error: ServiceError | null, response: RegisterAgentResponse) => void,
+  ): ClientUnaryCall;
+  registerAgent(
+    request: RegisterAgentRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: RegisterAgentResponse) => void,
+  ): ClientUnaryCall;
+  registerAgent(
+    request: RegisterAgentRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: RegisterAgentResponse) => void,
+  ): ClientUnaryCall;
+  unregisterAgent(request: Empty, callback: (error: ServiceError | null, response: Empty) => void): ClientUnaryCall;
+  unregisterAgent(
+    request: Empty,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  unregisterAgent(
+    request: Empty,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  reportHealth(
+    request: ReportHealthRequest,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  reportHealth(
+    request: ReportHealthRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  reportHealth(
+    request: ReportHealthRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientUnaryCall;
+  /** New Streaming RPCs */
+  streamJobs(request: StreamOptions, options?: Partial<CallOptions>): ClientReadableStream<Workflow>;
+  streamJobs(
+    request: StreamOptions,
+    metadata?: Metadata,
+    options?: Partial<CallOptions>,
+  ): ClientReadableStream<Workflow>;
+  submitStatus(callback: (error: ServiceError | null, response: Empty) => void): ClientWritableStream<StatusUpdate>;
+  submitStatus(
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientWritableStream<StatusUpdate>;
+  submitStatus(
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientWritableStream<StatusUpdate>;
+  submitStatus(
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: Empty) => void,
+  ): ClientWritableStream<StatusUpdate>;
+}
+
+export const WoodpeckerClient = makeGenericClientConstructor(WoodpeckerService, "proto.Woodpecker") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): WoodpeckerClient;
+  service: typeof WoodpeckerService;
+  serviceName: string;
+};
+
+export type WoodpeckerAuthService = typeof WoodpeckerAuthService;
+export const WoodpeckerAuthService = {
+  auth: {
+    path: "/proto.WoodpeckerAuth/Auth",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: AuthRequest): Buffer => Buffer.from(AuthRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer): AuthRequest => AuthRequest.decode(value),
+    responseSerialize: (value: AuthResponse): Buffer => Buffer.from(AuthResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer): AuthResponse => AuthResponse.decode(value),
+  },
+} as const;
+
+export interface WoodpeckerAuthServer extends UntypedServiceImplementation {
+  auth: handleUnaryCall<AuthRequest, AuthResponse>;
+}
+
+export interface WoodpeckerAuthClient extends Client {
+  auth(request: AuthRequest, callback: (error: ServiceError | null, response: AuthResponse) => void): ClientUnaryCall;
+  auth(
+    request: AuthRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: AuthResponse) => void,
+  ): ClientUnaryCall;
+  auth(
+    request: AuthRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: AuthResponse) => void,
+  ): ClientUnaryCall;
+}
+
+export const WoodpeckerAuthClient = makeGenericClientConstructor(
+  WoodpeckerAuthService,
+  "proto.WoodpeckerAuth",
+) as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): WoodpeckerAuthClient;
+  service: typeof WoodpeckerAuthService;
+  serviceName: string;
+};
+
+function bytesFromBase64(b64: string): Uint8Array {
+  return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+}
+
+function base64FromBytes(arr: Uint8Array): string {
+  return globalThis.Buffer.from(arr).toString("base64");
+}
+
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
+
+function longToNumber(int64: { toString(): string }): number {
+  const num = globalThis.Number(int64.toString());
+  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+    throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
+  }
+  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+    throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
+  }
+  return num;
+}
+
+function isObject(value: any): boolean {
+  return typeof value === "object" && value !== null;
+}
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
+
+export interface MessageFns<T> {
+  encode(message: T, writer?: BinaryWriter): BinaryWriter;
+  decode(input: BinaryReader | Uint8Array, length?: number): T;
+  fromJSON(object: any): T;
+  toJSON(message: T): unknown;
+  create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
+  fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
+}
diff --git a/src/server/gen/proto/app/v1/account.ts b/src/server/api/proto/app/v1/account.ts
similarity index 95%
rename from src/server/gen/proto/app/v1/account.ts
rename to src/server/api/proto/app/v1/account.ts
index a7fefcf..d2a9c08 100644
--- a/src/server/gen/proto/app/v1/account.ts
+++ b/src/server/api/proto/app/v1/account.ts
@@ -1386,10 +1386,10 @@ export const ClearNotificationsRequest: MessageFns<ClearNotificationsRequest> =
   },
 };
 
-export type AccountServiceService = typeof AccountServiceService;
-export const AccountServiceService = {
+export type AccountService = typeof AccountService;
+export const AccountService = {
   getMe: {
-    path: "/stream.app.v1.AccountService/GetMe",
+    path: "/stream.app.v1.Account/GetMe",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetMeRequest): Buffer => Buffer.from(GetMeRequest.encode(value).finish()),
@@ -1398,7 +1398,7 @@ export const AccountServiceService = {
     responseDeserialize: (value: Buffer): GetMeResponse => GetMeResponse.decode(value),
   },
   updateMe: {
-    path: "/stream.app.v1.AccountService/UpdateMe",
+    path: "/stream.app.v1.Account/UpdateMe",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateMeRequest): Buffer => Buffer.from(UpdateMeRequest.encode(value).finish()),
@@ -1407,7 +1407,7 @@ export const AccountServiceService = {
     responseDeserialize: (value: Buffer): UpdateMeResponse => UpdateMeResponse.decode(value),
   },
   deleteMe: {
-    path: "/stream.app.v1.AccountService/DeleteMe",
+    path: "/stream.app.v1.Account/DeleteMe",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteMeRequest): Buffer => Buffer.from(DeleteMeRequest.encode(value).finish()),
@@ -1416,7 +1416,7 @@ export const AccountServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   clearMyData: {
-    path: "/stream.app.v1.AccountService/ClearMyData",
+    path: "/stream.app.v1.Account/ClearMyData",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ClearMyDataRequest): Buffer => Buffer.from(ClearMyDataRequest.encode(value).finish()),
@@ -1425,7 +1425,7 @@ export const AccountServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   getUserById: {
-    path: "/stream.app.v1.AccountService/GetUserById",
+    path: "/stream.app.v1.Account/GetUserById",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: string | undefined): Buffer =>
@@ -1434,107 +1434,8 @@ export const AccountServiceService = {
     responseSerialize: (value: User): Buffer => Buffer.from(User.encode(value).finish()),
     responseDeserialize: (value: Buffer): User => User.decode(value),
   },
-} as const;
-
-export interface AccountServiceServer extends UntypedServiceImplementation {
-  getMe: handleUnaryCall<GetMeRequest, GetMeResponse>;
-  updateMe: handleUnaryCall<UpdateMeRequest, UpdateMeResponse>;
-  deleteMe: handleUnaryCall<DeleteMeRequest, MessageResponse>;
-  clearMyData: handleUnaryCall<ClearMyDataRequest, MessageResponse>;
-  getUserById: handleUnaryCall<string | undefined, User>;
-}
-
-export interface AccountServiceClient extends Client {
-  getMe(
-    request: GetMeRequest,
-    callback: (error: ServiceError | null, response: GetMeResponse) => void,
-  ): ClientUnaryCall;
-  getMe(
-    request: GetMeRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: GetMeResponse) => void,
-  ): ClientUnaryCall;
-  getMe(
-    request: GetMeRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: GetMeResponse) => void,
-  ): ClientUnaryCall;
-  updateMe(
-    request: UpdateMeRequest,
-    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
-  ): ClientUnaryCall;
-  updateMe(
-    request: UpdateMeRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
-  ): ClientUnaryCall;
-  updateMe(
-    request: UpdateMeRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
-  ): ClientUnaryCall;
-  deleteMe(
-    request: DeleteMeRequest,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  deleteMe(
-    request: DeleteMeRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  deleteMe(
-    request: DeleteMeRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  clearMyData(
-    request: ClearMyDataRequest,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  clearMyData(
-    request: ClearMyDataRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  clearMyData(
-    request: ClearMyDataRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: MessageResponse) => void,
-  ): ClientUnaryCall;
-  getUserById(
-    request: string | undefined,
-    callback: (error: ServiceError | null, response: User) => void,
-  ): ClientUnaryCall;
-  getUserById(
-    request: string | undefined,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: User) => void,
-  ): ClientUnaryCall;
-  getUserById(
-    request: string | undefined,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: User) => void,
-  ): ClientUnaryCall;
-}
-
-export const AccountServiceClient = makeGenericClientConstructor(
-  AccountServiceService,
-  "stream.app.v1.AccountService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AccountServiceClient;
-  service: typeof AccountServiceService;
-  serviceName: string;
-};
-
-export type PreferencesServiceService = typeof PreferencesServiceService;
-export const PreferencesServiceService = {
   getPreferences: {
-    path: "/stream.app.v1.PreferencesService/GetPreferences",
+    path: "/stream.app.v1.Account/GetPreferences",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetPreferencesRequest): Buffer =>
@@ -1545,7 +1446,7 @@ export const PreferencesServiceService = {
     responseDeserialize: (value: Buffer): GetPreferencesResponse => GetPreferencesResponse.decode(value),
   },
   updatePreferences: {
-    path: "/stream.app.v1.PreferencesService/UpdatePreferences",
+    path: "/stream.app.v1.Account/UpdatePreferences",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdatePreferencesRequest): Buffer =>
@@ -1555,59 +1456,8 @@ export const PreferencesServiceService = {
       Buffer.from(UpdatePreferencesResponse.encode(value).finish()),
     responseDeserialize: (value: Buffer): UpdatePreferencesResponse => UpdatePreferencesResponse.decode(value),
   },
-} as const;
-
-export interface PreferencesServiceServer extends UntypedServiceImplementation {
-  getPreferences: handleUnaryCall<GetPreferencesRequest, GetPreferencesResponse>;
-  updatePreferences: handleUnaryCall<UpdatePreferencesRequest, UpdatePreferencesResponse>;
-}
-
-export interface PreferencesServiceClient extends Client {
-  getPreferences(
-    request: GetPreferencesRequest,
-    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
-  ): ClientUnaryCall;
-  getPreferences(
-    request: GetPreferencesRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
-  ): ClientUnaryCall;
-  getPreferences(
-    request: GetPreferencesRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
-  ): ClientUnaryCall;
-  updatePreferences(
-    request: UpdatePreferencesRequest,
-    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
-  ): ClientUnaryCall;
-  updatePreferences(
-    request: UpdatePreferencesRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
-  ): ClientUnaryCall;
-  updatePreferences(
-    request: UpdatePreferencesRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
-  ): ClientUnaryCall;
-}
-
-export const PreferencesServiceClient = makeGenericClientConstructor(
-  PreferencesServiceService,
-  "stream.app.v1.PreferencesService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PreferencesServiceClient;
-  service: typeof PreferencesServiceService;
-  serviceName: string;
-};
-
-export type UsageServiceService = typeof UsageServiceService;
-export const UsageServiceService = {
   getUsage: {
-    path: "/stream.app.v1.UsageService/GetUsage",
+    path: "/stream.app.v1.Account/GetUsage",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetUsageRequest): Buffer => Buffer.from(GetUsageRequest.encode(value).finish()),
@@ -1617,11 +1467,123 @@ export const UsageServiceService = {
   },
 } as const;
 
-export interface UsageServiceServer extends UntypedServiceImplementation {
+export interface AccountServer extends UntypedServiceImplementation {
+  getMe: handleUnaryCall<GetMeRequest, GetMeResponse>;
+  updateMe: handleUnaryCall<UpdateMeRequest, UpdateMeResponse>;
+  deleteMe: handleUnaryCall<DeleteMeRequest, MessageResponse>;
+  clearMyData: handleUnaryCall<ClearMyDataRequest, MessageResponse>;
+  getUserById: handleUnaryCall<string | undefined, User>;
+  getPreferences: handleUnaryCall<GetPreferencesRequest, GetPreferencesResponse>;
+  updatePreferences: handleUnaryCall<UpdatePreferencesRequest, UpdatePreferencesResponse>;
   getUsage: handleUnaryCall<GetUsageRequest, GetUsageResponse>;
 }
 
-export interface UsageServiceClient extends Client {
+export interface AccountClient extends Client {
+  getMe(
+    request: GetMeRequest,
+    callback: (error: ServiceError | null, response: GetMeResponse) => void,
+  ): ClientUnaryCall;
+  getMe(
+    request: GetMeRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: GetMeResponse) => void,
+  ): ClientUnaryCall;
+  getMe(
+    request: GetMeRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: GetMeResponse) => void,
+  ): ClientUnaryCall;
+  updateMe(
+    request: UpdateMeRequest,
+    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
+  ): ClientUnaryCall;
+  updateMe(
+    request: UpdateMeRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
+  ): ClientUnaryCall;
+  updateMe(
+    request: UpdateMeRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: UpdateMeResponse) => void,
+  ): ClientUnaryCall;
+  deleteMe(
+    request: DeleteMeRequest,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  deleteMe(
+    request: DeleteMeRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  deleteMe(
+    request: DeleteMeRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  clearMyData(
+    request: ClearMyDataRequest,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  clearMyData(
+    request: ClearMyDataRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  clearMyData(
+    request: ClearMyDataRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: MessageResponse) => void,
+  ): ClientUnaryCall;
+  getUserById(
+    request: string | undefined,
+    callback: (error: ServiceError | null, response: User) => void,
+  ): ClientUnaryCall;
+  getUserById(
+    request: string | undefined,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: User) => void,
+  ): ClientUnaryCall;
+  getUserById(
+    request: string | undefined,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: User) => void,
+  ): ClientUnaryCall;
+  getPreferences(
+    request: GetPreferencesRequest,
+    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
+  ): ClientUnaryCall;
+  getPreferences(
+    request: GetPreferencesRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
+  ): ClientUnaryCall;
+  getPreferences(
+    request: GetPreferencesRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: GetPreferencesResponse) => void,
+  ): ClientUnaryCall;
+  updatePreferences(
+    request: UpdatePreferencesRequest,
+    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
+  ): ClientUnaryCall;
+  updatePreferences(
+    request: UpdatePreferencesRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
+  ): ClientUnaryCall;
+  updatePreferences(
+    request: UpdatePreferencesRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: UpdatePreferencesResponse) => void,
+  ): ClientUnaryCall;
   getUsage(
     request: GetUsageRequest,
     callback: (error: ServiceError | null, response: GetUsageResponse) => void,
@@ -1639,19 +1601,16 @@ export interface UsageServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const UsageServiceClient = makeGenericClientConstructor(
-  UsageServiceService,
-  "stream.app.v1.UsageService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): UsageServiceClient;
-  service: typeof UsageServiceService;
+export const AccountClient = makeGenericClientConstructor(AccountService, "stream.app.v1.Account") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AccountClient;
+  service: typeof AccountService;
   serviceName: string;
 };
 
-export type NotificationsServiceService = typeof NotificationsServiceService;
-export const NotificationsServiceService = {
+export type NotificationsService = typeof NotificationsService;
+export const NotificationsService = {
   listNotifications: {
-    path: "/stream.app.v1.NotificationsService/ListNotifications",
+    path: "/stream.app.v1.Notifications/ListNotifications",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListNotificationsRequest): Buffer =>
@@ -1662,7 +1621,7 @@ export const NotificationsServiceService = {
     responseDeserialize: (value: Buffer): ListNotificationsResponse => ListNotificationsResponse.decode(value),
   },
   markNotificationRead: {
-    path: "/stream.app.v1.NotificationsService/MarkNotificationRead",
+    path: "/stream.app.v1.Notifications/MarkNotificationRead",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: MarkNotificationReadRequest): Buffer =>
@@ -1672,7 +1631,7 @@ export const NotificationsServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   markAllNotificationsRead: {
-    path: "/stream.app.v1.NotificationsService/MarkAllNotificationsRead",
+    path: "/stream.app.v1.Notifications/MarkAllNotificationsRead",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: MarkAllNotificationsReadRequest): Buffer =>
@@ -1683,7 +1642,7 @@ export const NotificationsServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   deleteNotification: {
-    path: "/stream.app.v1.NotificationsService/DeleteNotification",
+    path: "/stream.app.v1.Notifications/DeleteNotification",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteNotificationRequest): Buffer =>
@@ -1693,7 +1652,7 @@ export const NotificationsServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   clearNotifications: {
-    path: "/stream.app.v1.NotificationsService/ClearNotifications",
+    path: "/stream.app.v1.Notifications/ClearNotifications",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ClearNotificationsRequest): Buffer =>
@@ -1704,7 +1663,7 @@ export const NotificationsServiceService = {
   },
 } as const;
 
-export interface NotificationsServiceServer extends UntypedServiceImplementation {
+export interface NotificationsServer extends UntypedServiceImplementation {
   listNotifications: handleUnaryCall<ListNotificationsRequest, ListNotificationsResponse>;
   markNotificationRead: handleUnaryCall<MarkNotificationReadRequest, MessageResponse>;
   markAllNotificationsRead: handleUnaryCall<MarkAllNotificationsReadRequest, MessageResponse>;
@@ -1712,7 +1671,7 @@ export interface NotificationsServiceServer extends UntypedServiceImplementation
   clearNotifications: handleUnaryCall<ClearNotificationsRequest, MessageResponse>;
 }
 
-export interface NotificationsServiceClient extends Client {
+export interface NotificationsClient extends Client {
   listNotifications(
     request: ListNotificationsRequest,
     callback: (error: ServiceError | null, response: ListNotificationsResponse) => void,
@@ -1790,12 +1749,12 @@ export interface NotificationsServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const NotificationsServiceClient = makeGenericClientConstructor(
-  NotificationsServiceService,
-  "stream.app.v1.NotificationsService",
+export const NotificationsClient = makeGenericClientConstructor(
+  NotificationsService,
+  "stream.app.v1.Notifications",
 ) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): NotificationsServiceClient;
-  service: typeof NotificationsServiceService;
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): NotificationsClient;
+  service: typeof NotificationsService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/app/v1/admin.ts b/src/server/api/proto/app/v1/admin.ts
similarity index 99%
rename from src/server/gen/proto/app/v1/admin.ts
rename to src/server/api/proto/app/v1/admin.ts
index 40484a1..2afb8b9 100644
--- a/src/server/gen/proto/app/v1/admin.ts
+++ b/src/server/api/proto/app/v1/admin.ts
@@ -7789,10 +7789,10 @@ export const AdminAgentCommandResponse: MessageFns<AdminAgentCommandResponse> =
   },
 };
 
-export type AdminServiceService = typeof AdminServiceService;
-export const AdminServiceService = {
+export type AdminService = typeof AdminService;
+export const AdminService = {
   getAdminDashboard: {
-    path: "/stream.app.v1.AdminService/GetAdminDashboard",
+    path: "/stream.app.v1.Admin/GetAdminDashboard",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminDashboardRequest): Buffer =>
@@ -7803,7 +7803,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminDashboardResponse => GetAdminDashboardResponse.decode(value),
   },
   listAdminUsers: {
-    path: "/stream.app.v1.AdminService/ListAdminUsers",
+    path: "/stream.app.v1.Admin/ListAdminUsers",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminUsersRequest): Buffer =>
@@ -7814,7 +7814,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminUsersResponse => ListAdminUsersResponse.decode(value),
   },
   getAdminUser: {
-    path: "/stream.app.v1.AdminService/GetAdminUser",
+    path: "/stream.app.v1.Admin/GetAdminUser",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminUserRequest): Buffer => Buffer.from(GetAdminUserRequest.encode(value).finish()),
@@ -7824,7 +7824,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminUserResponse => GetAdminUserResponse.decode(value),
   },
   createAdminUser: {
-    path: "/stream.app.v1.AdminService/CreateAdminUser",
+    path: "/stream.app.v1.Admin/CreateAdminUser",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminUserRequest): Buffer =>
@@ -7835,7 +7835,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminUserResponse => CreateAdminUserResponse.decode(value),
   },
   updateAdminUser: {
-    path: "/stream.app.v1.AdminService/UpdateAdminUser",
+    path: "/stream.app.v1.Admin/UpdateAdminUser",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminUserRequest): Buffer =>
@@ -7846,7 +7846,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminUserResponse => UpdateAdminUserResponse.decode(value),
   },
   updateAdminUserReferralSettings: {
-    path: "/stream.app.v1.AdminService/UpdateAdminUserReferralSettings",
+    path: "/stream.app.v1.Admin/UpdateAdminUserReferralSettings",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminUserReferralSettingsRequest): Buffer =>
@@ -7859,7 +7859,7 @@ export const AdminServiceService = {
       UpdateAdminUserReferralSettingsResponse.decode(value),
   },
   updateAdminUserRole: {
-    path: "/stream.app.v1.AdminService/UpdateAdminUserRole",
+    path: "/stream.app.v1.Admin/UpdateAdminUserRole",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminUserRoleRequest): Buffer =>
@@ -7870,7 +7870,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminUserRoleResponse => UpdateAdminUserRoleResponse.decode(value),
   },
   deleteAdminUser: {
-    path: "/stream.app.v1.AdminService/DeleteAdminUser",
+    path: "/stream.app.v1.Admin/DeleteAdminUser",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdminUserRequest): Buffer =>
@@ -7880,7 +7880,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   listAdminVideos: {
-    path: "/stream.app.v1.AdminService/ListAdminVideos",
+    path: "/stream.app.v1.Admin/ListAdminVideos",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminVideosRequest): Buffer =>
@@ -7891,7 +7891,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminVideosResponse => ListAdminVideosResponse.decode(value),
   },
   getAdminVideo: {
-    path: "/stream.app.v1.AdminService/GetAdminVideo",
+    path: "/stream.app.v1.Admin/GetAdminVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminVideoRequest): Buffer => Buffer.from(GetAdminVideoRequest.encode(value).finish()),
@@ -7901,7 +7901,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminVideoResponse => GetAdminVideoResponse.decode(value),
   },
   createAdminVideo: {
-    path: "/stream.app.v1.AdminService/CreateAdminVideo",
+    path: "/stream.app.v1.Admin/CreateAdminVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminVideoRequest): Buffer =>
@@ -7912,7 +7912,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminVideoResponse => CreateAdminVideoResponse.decode(value),
   },
   updateAdminVideo: {
-    path: "/stream.app.v1.AdminService/UpdateAdminVideo",
+    path: "/stream.app.v1.Admin/UpdateAdminVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminVideoRequest): Buffer =>
@@ -7923,7 +7923,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminVideoResponse => UpdateAdminVideoResponse.decode(value),
   },
   deleteAdminVideo: {
-    path: "/stream.app.v1.AdminService/DeleteAdminVideo",
+    path: "/stream.app.v1.Admin/DeleteAdminVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdminVideoRequest): Buffer =>
@@ -7933,7 +7933,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   listAdminPayments: {
-    path: "/stream.app.v1.AdminService/ListAdminPayments",
+    path: "/stream.app.v1.Admin/ListAdminPayments",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminPaymentsRequest): Buffer =>
@@ -7944,7 +7944,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminPaymentsResponse => ListAdminPaymentsResponse.decode(value),
   },
   getAdminPayment: {
-    path: "/stream.app.v1.AdminService/GetAdminPayment",
+    path: "/stream.app.v1.Admin/GetAdminPayment",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminPaymentRequest): Buffer =>
@@ -7955,7 +7955,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminPaymentResponse => GetAdminPaymentResponse.decode(value),
   },
   createAdminPayment: {
-    path: "/stream.app.v1.AdminService/CreateAdminPayment",
+    path: "/stream.app.v1.Admin/CreateAdminPayment",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminPaymentRequest): Buffer =>
@@ -7966,7 +7966,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminPaymentResponse => CreateAdminPaymentResponse.decode(value),
   },
   updateAdminPayment: {
-    path: "/stream.app.v1.AdminService/UpdateAdminPayment",
+    path: "/stream.app.v1.Admin/UpdateAdminPayment",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminPaymentRequest): Buffer =>
@@ -7977,7 +7977,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminPaymentResponse => UpdateAdminPaymentResponse.decode(value),
   },
   listAdminPlans: {
-    path: "/stream.app.v1.AdminService/ListAdminPlans",
+    path: "/stream.app.v1.Admin/ListAdminPlans",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminPlansRequest): Buffer =>
@@ -7988,7 +7988,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminPlansResponse => ListAdminPlansResponse.decode(value),
   },
   createAdminPlan: {
-    path: "/stream.app.v1.AdminService/CreateAdminPlan",
+    path: "/stream.app.v1.Admin/CreateAdminPlan",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminPlanRequest): Buffer =>
@@ -7999,7 +7999,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminPlanResponse => CreateAdminPlanResponse.decode(value),
   },
   updateAdminPlan: {
-    path: "/stream.app.v1.AdminService/UpdateAdminPlan",
+    path: "/stream.app.v1.Admin/UpdateAdminPlan",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminPlanRequest): Buffer =>
@@ -8010,7 +8010,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminPlanResponse => UpdateAdminPlanResponse.decode(value),
   },
   deleteAdminPlan: {
-    path: "/stream.app.v1.AdminService/DeleteAdminPlan",
+    path: "/stream.app.v1.Admin/DeleteAdminPlan",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdminPlanRequest): Buffer =>
@@ -8021,7 +8021,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): DeleteAdminPlanResponse => DeleteAdminPlanResponse.decode(value),
   },
   listAdminAdTemplates: {
-    path: "/stream.app.v1.AdminService/ListAdminAdTemplates",
+    path: "/stream.app.v1.Admin/ListAdminAdTemplates",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminAdTemplatesRequest): Buffer =>
@@ -8032,7 +8032,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminAdTemplatesResponse => ListAdminAdTemplatesResponse.decode(value),
   },
   getAdminAdTemplate: {
-    path: "/stream.app.v1.AdminService/GetAdminAdTemplate",
+    path: "/stream.app.v1.Admin/GetAdminAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminAdTemplateRequest): Buffer =>
@@ -8043,7 +8043,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminAdTemplateResponse => GetAdminAdTemplateResponse.decode(value),
   },
   createAdminAdTemplate: {
-    path: "/stream.app.v1.AdminService/CreateAdminAdTemplate",
+    path: "/stream.app.v1.Admin/CreateAdminAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminAdTemplateRequest): Buffer =>
@@ -8054,7 +8054,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminAdTemplateResponse => CreateAdminAdTemplateResponse.decode(value),
   },
   updateAdminAdTemplate: {
-    path: "/stream.app.v1.AdminService/UpdateAdminAdTemplate",
+    path: "/stream.app.v1.Admin/UpdateAdminAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminAdTemplateRequest): Buffer =>
@@ -8065,7 +8065,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdminAdTemplateResponse => UpdateAdminAdTemplateResponse.decode(value),
   },
   deleteAdminAdTemplate: {
-    path: "/stream.app.v1.AdminService/DeleteAdminAdTemplate",
+    path: "/stream.app.v1.Admin/DeleteAdminAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdminAdTemplateRequest): Buffer =>
@@ -8075,7 +8075,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   listAdminPlayerConfigs: {
-    path: "/stream.app.v1.AdminService/ListAdminPlayerConfigs",
+    path: "/stream.app.v1.Admin/ListAdminPlayerConfigs",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminPlayerConfigsRequest): Buffer =>
@@ -8087,7 +8087,7 @@ export const AdminServiceService = {
       ListAdminPlayerConfigsResponse.decode(value),
   },
   getAdminPlayerConfig: {
-    path: "/stream.app.v1.AdminService/GetAdminPlayerConfig",
+    path: "/stream.app.v1.Admin/GetAdminPlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminPlayerConfigRequest): Buffer =>
@@ -8098,7 +8098,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminPlayerConfigResponse => GetAdminPlayerConfigResponse.decode(value),
   },
   createAdminPlayerConfig: {
-    path: "/stream.app.v1.AdminService/CreateAdminPlayerConfig",
+    path: "/stream.app.v1.Admin/CreateAdminPlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminPlayerConfigRequest): Buffer =>
@@ -8110,7 +8110,7 @@ export const AdminServiceService = {
       CreateAdminPlayerConfigResponse.decode(value),
   },
   updateAdminPlayerConfig: {
-    path: "/stream.app.v1.AdminService/UpdateAdminPlayerConfig",
+    path: "/stream.app.v1.Admin/UpdateAdminPlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminPlayerConfigRequest): Buffer =>
@@ -8122,7 +8122,7 @@ export const AdminServiceService = {
       UpdateAdminPlayerConfigResponse.decode(value),
   },
   deleteAdminPlayerConfig: {
-    path: "/stream.app.v1.AdminService/DeleteAdminPlayerConfig",
+    path: "/stream.app.v1.Admin/DeleteAdminPlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdminPlayerConfigRequest): Buffer =>
@@ -8132,7 +8132,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   listAdminJobs: {
-    path: "/stream.app.v1.AdminService/ListAdminJobs",
+    path: "/stream.app.v1.Admin/ListAdminJobs",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminJobsRequest): Buffer => Buffer.from(ListAdminJobsRequest.encode(value).finish()),
@@ -8142,7 +8142,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminJobsResponse => ListAdminJobsResponse.decode(value),
   },
   getAdminJob: {
-    path: "/stream.app.v1.AdminService/GetAdminJob",
+    path: "/stream.app.v1.Admin/GetAdminJob",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminJobRequest): Buffer => Buffer.from(GetAdminJobRequest.encode(value).finish()),
@@ -8151,7 +8151,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminJobResponse => GetAdminJobResponse.decode(value),
   },
   getAdminJobLogs: {
-    path: "/stream.app.v1.AdminService/GetAdminJobLogs",
+    path: "/stream.app.v1.Admin/GetAdminJobLogs",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetAdminJobLogsRequest): Buffer =>
@@ -8162,7 +8162,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): GetAdminJobLogsResponse => GetAdminJobLogsResponse.decode(value),
   },
   createAdminJob: {
-    path: "/stream.app.v1.AdminService/CreateAdminJob",
+    path: "/stream.app.v1.Admin/CreateAdminJob",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdminJobRequest): Buffer =>
@@ -8173,7 +8173,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CreateAdminJobResponse => CreateAdminJobResponse.decode(value),
   },
   cancelAdminJob: {
-    path: "/stream.app.v1.AdminService/CancelAdminJob",
+    path: "/stream.app.v1.Admin/CancelAdminJob",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CancelAdminJobRequest): Buffer =>
@@ -8184,7 +8184,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): CancelAdminJobResponse => CancelAdminJobResponse.decode(value),
   },
   retryAdminJob: {
-    path: "/stream.app.v1.AdminService/RetryAdminJob",
+    path: "/stream.app.v1.Admin/RetryAdminJob",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: RetryAdminJobRequest): Buffer => Buffer.from(RetryAdminJobRequest.encode(value).finish()),
@@ -8194,7 +8194,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): RetryAdminJobResponse => RetryAdminJobResponse.decode(value),
   },
   listAdminAgents: {
-    path: "/stream.app.v1.AdminService/ListAdminAgents",
+    path: "/stream.app.v1.Admin/ListAdminAgents",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdminAgentsRequest): Buffer =>
@@ -8205,7 +8205,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): ListAdminAgentsResponse => ListAdminAgentsResponse.decode(value),
   },
   restartAdminAgent: {
-    path: "/stream.app.v1.AdminService/RestartAdminAgent",
+    path: "/stream.app.v1.Admin/RestartAdminAgent",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: RestartAdminAgentRequest): Buffer =>
@@ -8216,7 +8216,7 @@ export const AdminServiceService = {
     responseDeserialize: (value: Buffer): AdminAgentCommandResponse => AdminAgentCommandResponse.decode(value),
   },
   updateAdminAgent: {
-    path: "/stream.app.v1.AdminService/UpdateAdminAgent",
+    path: "/stream.app.v1.Admin/UpdateAdminAgent",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdminAgentRequest): Buffer =>
@@ -8228,7 +8228,7 @@ export const AdminServiceService = {
   },
 } as const;
 
-export interface AdminServiceServer extends UntypedServiceImplementation {
+export interface AdminServer extends UntypedServiceImplementation {
   getAdminDashboard: handleUnaryCall<GetAdminDashboardRequest, GetAdminDashboardResponse>;
   listAdminUsers: handleUnaryCall<ListAdminUsersRequest, ListAdminUsersResponse>;
   getAdminUser: handleUnaryCall<GetAdminUserRequest, GetAdminUserResponse>;
@@ -8274,7 +8274,7 @@ export interface AdminServiceServer extends UntypedServiceImplementation {
   updateAdminAgent: handleUnaryCall<UpdateAdminAgentRequest, AdminAgentCommandResponse>;
 }
 
-export interface AdminServiceClient extends Client {
+export interface AdminClient extends Client {
   getAdminDashboard(
     request: GetAdminDashboardRequest,
     callback: (error: ServiceError | null, response: GetAdminDashboardResponse) => void,
@@ -8877,12 +8877,9 @@ export interface AdminServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const AdminServiceClient = makeGenericClientConstructor(
-  AdminServiceService,
-  "stream.app.v1.AdminService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AdminServiceClient;
-  service: typeof AdminServiceService;
+export const AdminClient = makeGenericClientConstructor(AdminService, "stream.app.v1.Admin") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AdminClient;
+  service: typeof AdminService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/app/v1/auth.ts b/src/server/api/proto/app/v1/auth.ts
similarity index 97%
rename from src/server/gen/proto/app/v1/auth.ts
rename to src/server/api/proto/app/v1/auth.ts
index 37832ec..cbb10d4 100644
--- a/src/server/gen/proto/app/v1/auth.ts
+++ b/src/server/api/proto/app/v1/auth.ts
@@ -883,10 +883,10 @@ export const CompleteGoogleLoginResponse: MessageFns<CompleteGoogleLoginResponse
   },
 };
 
-export type AuthServiceService = typeof AuthServiceService;
-export const AuthServiceService = {
+export type AuthService = typeof AuthService;
+export const AuthService = {
   login: {
-    path: "/stream.app.v1.AuthService/Login",
+    path: "/stream.app.v1.Auth/Login",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: LoginRequest): Buffer => Buffer.from(LoginRequest.encode(value).finish()),
@@ -895,7 +895,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): LoginResponse => LoginResponse.decode(value),
   },
   register: {
-    path: "/stream.app.v1.AuthService/Register",
+    path: "/stream.app.v1.Auth/Register",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: RegisterRequest): Buffer => Buffer.from(RegisterRequest.encode(value).finish()),
@@ -904,7 +904,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): RegisterResponse => RegisterResponse.decode(value),
   },
   logout: {
-    path: "/stream.app.v1.AuthService/Logout",
+    path: "/stream.app.v1.Auth/Logout",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: LogoutRequest): Buffer => Buffer.from(LogoutRequest.encode(value).finish()),
@@ -913,7 +913,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   changePassword: {
-    path: "/stream.app.v1.AuthService/ChangePassword",
+    path: "/stream.app.v1.Auth/ChangePassword",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ChangePasswordRequest): Buffer =>
@@ -923,7 +923,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   forgotPassword: {
-    path: "/stream.app.v1.AuthService/ForgotPassword",
+    path: "/stream.app.v1.Auth/ForgotPassword",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ForgotPasswordRequest): Buffer =>
@@ -933,7 +933,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   resetPassword: {
-    path: "/stream.app.v1.AuthService/ResetPassword",
+    path: "/stream.app.v1.Auth/ResetPassword",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ResetPasswordRequest): Buffer => Buffer.from(ResetPasswordRequest.encode(value).finish()),
@@ -942,7 +942,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): MessageResponse => MessageResponse.decode(value),
   },
   getGoogleLoginUrl: {
-    path: "/stream.app.v1.AuthService/GetGoogleLoginUrl",
+    path: "/stream.app.v1.Auth/GetGoogleLoginUrl",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetGoogleLoginUrlRequest): Buffer =>
@@ -953,7 +953,7 @@ export const AuthServiceService = {
     responseDeserialize: (value: Buffer): GetGoogleLoginUrlResponse => GetGoogleLoginUrlResponse.decode(value),
   },
   completeGoogleLogin: {
-    path: "/stream.app.v1.AuthService/CompleteGoogleLogin",
+    path: "/stream.app.v1.Auth/CompleteGoogleLogin",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CompleteGoogleLoginRequest): Buffer =>
@@ -965,7 +965,7 @@ export const AuthServiceService = {
   },
 } as const;
 
-export interface AuthServiceServer extends UntypedServiceImplementation {
+export interface AuthServer extends UntypedServiceImplementation {
   login: handleUnaryCall<LoginRequest, LoginResponse>;
   register: handleUnaryCall<RegisterRequest, RegisterResponse>;
   logout: handleUnaryCall<LogoutRequest, MessageResponse>;
@@ -976,7 +976,7 @@ export interface AuthServiceServer extends UntypedServiceImplementation {
   completeGoogleLogin: handleUnaryCall<CompleteGoogleLoginRequest, CompleteGoogleLoginResponse>;
 }
 
-export interface AuthServiceClient extends Client {
+export interface AuthClient extends Client {
   login(
     request: LoginRequest,
     callback: (error: ServiceError | null, response: LoginResponse) => void,
@@ -1099,12 +1099,9 @@ export interface AuthServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const AuthServiceClient = makeGenericClientConstructor(
-  AuthServiceService,
-  "stream.app.v1.AuthService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AuthServiceClient;
-  service: typeof AuthServiceService;
+export const AuthClient = makeGenericClientConstructor(AuthService, "stream.app.v1.Auth") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AuthClient;
+  service: typeof AuthService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/app/v1/catalog.ts b/src/server/api/proto/app/v1/catalog.ts
similarity index 96%
rename from src/server/gen/proto/app/v1/catalog.ts
rename to src/server/api/proto/app/v1/catalog.ts
index cd4f18f..9dad9d4 100644
--- a/src/server/gen/proto/app/v1/catalog.ts
+++ b/src/server/api/proto/app/v1/catalog.ts
@@ -2072,10 +2072,10 @@ export const ListPlansResponse: MessageFns<ListPlansResponse> = {
   },
 };
 
-export type DomainsServiceService = typeof DomainsServiceService;
-export const DomainsServiceService = {
+export type DomainsService = typeof DomainsService;
+export const DomainsService = {
   listDomains: {
-    path: "/stream.app.v1.DomainsService/ListDomains",
+    path: "/stream.app.v1.Domains/ListDomains",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListDomainsRequest): Buffer => Buffer.from(ListDomainsRequest.encode(value).finish()),
@@ -2084,7 +2084,7 @@ export const DomainsServiceService = {
     responseDeserialize: (value: Buffer): ListDomainsResponse => ListDomainsResponse.decode(value),
   },
   createDomain: {
-    path: "/stream.app.v1.DomainsService/CreateDomain",
+    path: "/stream.app.v1.Domains/CreateDomain",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateDomainRequest): Buffer => Buffer.from(CreateDomainRequest.encode(value).finish()),
@@ -2094,7 +2094,7 @@ export const DomainsServiceService = {
     responseDeserialize: (value: Buffer): CreateDomainResponse => CreateDomainResponse.decode(value),
   },
   deleteDomain: {
-    path: "/stream.app.v1.DomainsService/DeleteDomain",
+    path: "/stream.app.v1.Domains/DeleteDomain",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteDomainRequest): Buffer => Buffer.from(DeleteDomainRequest.encode(value).finish()),
@@ -2104,13 +2104,13 @@ export const DomainsServiceService = {
   },
 } as const;
 
-export interface DomainsServiceServer extends UntypedServiceImplementation {
+export interface DomainsServer extends UntypedServiceImplementation {
   listDomains: handleUnaryCall<ListDomainsRequest, ListDomainsResponse>;
   createDomain: handleUnaryCall<CreateDomainRequest, CreateDomainResponse>;
   deleteDomain: handleUnaryCall<DeleteDomainRequest, MessageResponse>;
 }
 
-export interface DomainsServiceClient extends Client {
+export interface DomainsClient extends Client {
   listDomains(
     request: ListDomainsRequest,
     callback: (error: ServiceError | null, response: ListDomainsResponse) => void,
@@ -2158,19 +2158,16 @@ export interface DomainsServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const DomainsServiceClient = makeGenericClientConstructor(
-  DomainsServiceService,
-  "stream.app.v1.DomainsService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): DomainsServiceClient;
-  service: typeof DomainsServiceService;
+export const DomainsClient = makeGenericClientConstructor(DomainsService, "stream.app.v1.Domains") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): DomainsClient;
+  service: typeof DomainsService;
   serviceName: string;
 };
 
-export type AdTemplatesServiceService = typeof AdTemplatesServiceService;
-export const AdTemplatesServiceService = {
+export type AdTemplatesService = typeof AdTemplatesService;
+export const AdTemplatesService = {
   listAdTemplates: {
-    path: "/stream.app.v1.AdTemplatesService/ListAdTemplates",
+    path: "/stream.app.v1.AdTemplates/ListAdTemplates",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListAdTemplatesRequest): Buffer =>
@@ -2181,7 +2178,7 @@ export const AdTemplatesServiceService = {
     responseDeserialize: (value: Buffer): ListAdTemplatesResponse => ListAdTemplatesResponse.decode(value),
   },
   createAdTemplate: {
-    path: "/stream.app.v1.AdTemplatesService/CreateAdTemplate",
+    path: "/stream.app.v1.AdTemplates/CreateAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateAdTemplateRequest): Buffer =>
@@ -2192,7 +2189,7 @@ export const AdTemplatesServiceService = {
     responseDeserialize: (value: Buffer): CreateAdTemplateResponse => CreateAdTemplateResponse.decode(value),
   },
   updateAdTemplate: {
-    path: "/stream.app.v1.AdTemplatesService/UpdateAdTemplate",
+    path: "/stream.app.v1.AdTemplates/UpdateAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateAdTemplateRequest): Buffer =>
@@ -2203,7 +2200,7 @@ export const AdTemplatesServiceService = {
     responseDeserialize: (value: Buffer): UpdateAdTemplateResponse => UpdateAdTemplateResponse.decode(value),
   },
   deleteAdTemplate: {
-    path: "/stream.app.v1.AdTemplatesService/DeleteAdTemplate",
+    path: "/stream.app.v1.AdTemplates/DeleteAdTemplate",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteAdTemplateRequest): Buffer =>
@@ -2214,14 +2211,14 @@ export const AdTemplatesServiceService = {
   },
 } as const;
 
-export interface AdTemplatesServiceServer extends UntypedServiceImplementation {
+export interface AdTemplatesServer extends UntypedServiceImplementation {
   listAdTemplates: handleUnaryCall<ListAdTemplatesRequest, ListAdTemplatesResponse>;
   createAdTemplate: handleUnaryCall<CreateAdTemplateRequest, CreateAdTemplateResponse>;
   updateAdTemplate: handleUnaryCall<UpdateAdTemplateRequest, UpdateAdTemplateResponse>;
   deleteAdTemplate: handleUnaryCall<DeleteAdTemplateRequest, MessageResponse>;
 }
 
-export interface AdTemplatesServiceClient extends Client {
+export interface AdTemplatesClient extends Client {
   listAdTemplates(
     request: ListAdTemplatesRequest,
     callback: (error: ServiceError | null, response: ListAdTemplatesResponse) => void,
@@ -2284,19 +2281,19 @@ export interface AdTemplatesServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const AdTemplatesServiceClient = makeGenericClientConstructor(
-  AdTemplatesServiceService,
-  "stream.app.v1.AdTemplatesService",
+export const AdTemplatesClient = makeGenericClientConstructor(
+  AdTemplatesService,
+  "stream.app.v1.AdTemplates",
 ) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AdTemplatesServiceClient;
-  service: typeof AdTemplatesServiceService;
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): AdTemplatesClient;
+  service: typeof AdTemplatesService;
   serviceName: string;
 };
 
-export type PlayerConfigsServiceService = typeof PlayerConfigsServiceService;
-export const PlayerConfigsServiceService = {
+export type PlayerConfigsService = typeof PlayerConfigsService;
+export const PlayerConfigsService = {
   listPlayerConfigs: {
-    path: "/stream.app.v1.PlayerConfigsService/ListPlayerConfigs",
+    path: "/stream.app.v1.PlayerConfigs/ListPlayerConfigs",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListPlayerConfigsRequest): Buffer =>
@@ -2307,7 +2304,7 @@ export const PlayerConfigsServiceService = {
     responseDeserialize: (value: Buffer): ListPlayerConfigsResponse => ListPlayerConfigsResponse.decode(value),
   },
   createPlayerConfig: {
-    path: "/stream.app.v1.PlayerConfigsService/CreatePlayerConfig",
+    path: "/stream.app.v1.PlayerConfigs/CreatePlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreatePlayerConfigRequest): Buffer =>
@@ -2318,7 +2315,7 @@ export const PlayerConfigsServiceService = {
     responseDeserialize: (value: Buffer): CreatePlayerConfigResponse => CreatePlayerConfigResponse.decode(value),
   },
   updatePlayerConfig: {
-    path: "/stream.app.v1.PlayerConfigsService/UpdatePlayerConfig",
+    path: "/stream.app.v1.PlayerConfigs/UpdatePlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdatePlayerConfigRequest): Buffer =>
@@ -2329,7 +2326,7 @@ export const PlayerConfigsServiceService = {
     responseDeserialize: (value: Buffer): UpdatePlayerConfigResponse => UpdatePlayerConfigResponse.decode(value),
   },
   deletePlayerConfig: {
-    path: "/stream.app.v1.PlayerConfigsService/DeletePlayerConfig",
+    path: "/stream.app.v1.PlayerConfigs/DeletePlayerConfig",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeletePlayerConfigRequest): Buffer =>
@@ -2340,14 +2337,14 @@ export const PlayerConfigsServiceService = {
   },
 } as const;
 
-export interface PlayerConfigsServiceServer extends UntypedServiceImplementation {
+export interface PlayerConfigsServer extends UntypedServiceImplementation {
   listPlayerConfigs: handleUnaryCall<ListPlayerConfigsRequest, ListPlayerConfigsResponse>;
   createPlayerConfig: handleUnaryCall<CreatePlayerConfigRequest, CreatePlayerConfigResponse>;
   updatePlayerConfig: handleUnaryCall<UpdatePlayerConfigRequest, UpdatePlayerConfigResponse>;
   deletePlayerConfig: handleUnaryCall<DeletePlayerConfigRequest, MessageResponse>;
 }
 
-export interface PlayerConfigsServiceClient extends Client {
+export interface PlayerConfigsClient extends Client {
   listPlayerConfigs(
     request: ListPlayerConfigsRequest,
     callback: (error: ServiceError | null, response: ListPlayerConfigsResponse) => void,
@@ -2410,19 +2407,19 @@ export interface PlayerConfigsServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const PlayerConfigsServiceClient = makeGenericClientConstructor(
-  PlayerConfigsServiceService,
-  "stream.app.v1.PlayerConfigsService",
+export const PlayerConfigsClient = makeGenericClientConstructor(
+  PlayerConfigsService,
+  "stream.app.v1.PlayerConfigs",
 ) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PlayerConfigsServiceClient;
-  service: typeof PlayerConfigsServiceService;
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PlayerConfigsClient;
+  service: typeof PlayerConfigsService;
   serviceName: string;
 };
 
-export type PlansServiceService = typeof PlansServiceService;
-export const PlansServiceService = {
+export type PlansService = typeof PlansService;
+export const PlansService = {
   listPlans: {
-    path: "/stream.app.v1.PlansService/ListPlans",
+    path: "/stream.app.v1.Plans/ListPlans",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListPlansRequest): Buffer => Buffer.from(ListPlansRequest.encode(value).finish()),
@@ -2432,11 +2429,11 @@ export const PlansServiceService = {
   },
 } as const;
 
-export interface PlansServiceServer extends UntypedServiceImplementation {
+export interface PlansServer extends UntypedServiceImplementation {
   listPlans: handleUnaryCall<ListPlansRequest, ListPlansResponse>;
 }
 
-export interface PlansServiceClient extends Client {
+export interface PlansClient extends Client {
   listPlans(
     request: ListPlansRequest,
     callback: (error: ServiceError | null, response: ListPlansResponse) => void,
@@ -2454,12 +2451,9 @@ export interface PlansServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const PlansServiceClient = makeGenericClientConstructor(
-  PlansServiceService,
-  "stream.app.v1.PlansService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PlansServiceClient;
-  service: typeof PlansServiceService;
+export const PlansClient = makeGenericClientConstructor(PlansService, "stream.app.v1.Plans") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PlansClient;
+  service: typeof PlansService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/app/v1/common.ts b/src/server/api/proto/app/v1/common.ts
similarity index 100%
rename from src/server/gen/proto/app/v1/common.ts
rename to src/server/api/proto/app/v1/common.ts
diff --git a/src/server/gen/proto/app/v1/payments.ts b/src/server/api/proto/app/v1/payments.ts
similarity index 97%
rename from src/server/gen/proto/app/v1/payments.ts
rename to src/server/api/proto/app/v1/payments.ts
index eaea6db..23d85f2 100644
--- a/src/server/gen/proto/app/v1/payments.ts
+++ b/src/server/api/proto/app/v1/payments.ts
@@ -880,10 +880,10 @@ export const DownloadInvoiceResponse: MessageFns<DownloadInvoiceResponse> = {
   },
 };
 
-export type PaymentsServiceService = typeof PaymentsServiceService;
-export const PaymentsServiceService = {
+export type PaymentsService = typeof PaymentsService;
+export const PaymentsService = {
   createPayment: {
-    path: "/stream.app.v1.PaymentsService/CreatePayment",
+    path: "/stream.app.v1.Payments/CreatePayment",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreatePaymentRequest): Buffer => Buffer.from(CreatePaymentRequest.encode(value).finish()),
@@ -893,7 +893,7 @@ export const PaymentsServiceService = {
     responseDeserialize: (value: Buffer): CreatePaymentResponse => CreatePaymentResponse.decode(value),
   },
   listPaymentHistory: {
-    path: "/stream.app.v1.PaymentsService/ListPaymentHistory",
+    path: "/stream.app.v1.Payments/ListPaymentHistory",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListPaymentHistoryRequest): Buffer =>
@@ -904,7 +904,7 @@ export const PaymentsServiceService = {
     responseDeserialize: (value: Buffer): ListPaymentHistoryResponse => ListPaymentHistoryResponse.decode(value),
   },
   topupWallet: {
-    path: "/stream.app.v1.PaymentsService/TopupWallet",
+    path: "/stream.app.v1.Payments/TopupWallet",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: TopupWalletRequest): Buffer => Buffer.from(TopupWalletRequest.encode(value).finish()),
@@ -913,7 +913,7 @@ export const PaymentsServiceService = {
     responseDeserialize: (value: Buffer): TopupWalletResponse => TopupWalletResponse.decode(value),
   },
   downloadInvoice: {
-    path: "/stream.app.v1.PaymentsService/DownloadInvoice",
+    path: "/stream.app.v1.Payments/DownloadInvoice",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DownloadInvoiceRequest): Buffer =>
@@ -925,14 +925,14 @@ export const PaymentsServiceService = {
   },
 } as const;
 
-export interface PaymentsServiceServer extends UntypedServiceImplementation {
+export interface PaymentsServer extends UntypedServiceImplementation {
   createPayment: handleUnaryCall<CreatePaymentRequest, CreatePaymentResponse>;
   listPaymentHistory: handleUnaryCall<ListPaymentHistoryRequest, ListPaymentHistoryResponse>;
   topupWallet: handleUnaryCall<TopupWalletRequest, TopupWalletResponse>;
   downloadInvoice: handleUnaryCall<DownloadInvoiceRequest, DownloadInvoiceResponse>;
 }
 
-export interface PaymentsServiceClient extends Client {
+export interface PaymentsClient extends Client {
   createPayment(
     request: CreatePaymentRequest,
     callback: (error: ServiceError | null, response: CreatePaymentResponse) => void,
@@ -995,12 +995,9 @@ export interface PaymentsServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const PaymentsServiceClient = makeGenericClientConstructor(
-  PaymentsServiceService,
-  "stream.app.v1.PaymentsService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PaymentsServiceClient;
-  service: typeof PaymentsServiceService;
+export const PaymentsClient = makeGenericClientConstructor(PaymentsService, "stream.app.v1.Payments") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): PaymentsClient;
+  service: typeof PaymentsService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/app/v1/videos.ts b/src/server/api/proto/app/v1/videos.ts
similarity index 98%
rename from src/server/gen/proto/app/v1/videos.ts
rename to src/server/api/proto/app/v1/videos.ts
index 10cd85c..0fa191a 100644
--- a/src/server/gen/proto/app/v1/videos.ts
+++ b/src/server/api/proto/app/v1/videos.ts
@@ -1076,10 +1076,10 @@ export const DeleteVideoRequest: MessageFns<DeleteVideoRequest> = {
   },
 };
 
-export type VideosServiceService = typeof VideosServiceService;
-export const VideosServiceService = {
+export type VideosService = typeof VideosService;
+export const VideosService = {
   getUploadUrl: {
-    path: "/stream.app.v1.VideosService/GetUploadUrl",
+    path: "/stream.app.v1.Videos/GetUploadUrl",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetUploadUrlRequest): Buffer => Buffer.from(GetUploadUrlRequest.encode(value).finish()),
@@ -1089,7 +1089,7 @@ export const VideosServiceService = {
     responseDeserialize: (value: Buffer): GetUploadUrlResponse => GetUploadUrlResponse.decode(value),
   },
   createVideo: {
-    path: "/stream.app.v1.VideosService/CreateVideo",
+    path: "/stream.app.v1.Videos/CreateVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: CreateVideoRequest): Buffer => Buffer.from(CreateVideoRequest.encode(value).finish()),
@@ -1098,7 +1098,7 @@ export const VideosServiceService = {
     responseDeserialize: (value: Buffer): CreateVideoResponse => CreateVideoResponse.decode(value),
   },
   listVideos: {
-    path: "/stream.app.v1.VideosService/ListVideos",
+    path: "/stream.app.v1.Videos/ListVideos",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: ListVideosRequest): Buffer => Buffer.from(ListVideosRequest.encode(value).finish()),
@@ -1107,7 +1107,7 @@ export const VideosServiceService = {
     responseDeserialize: (value: Buffer): ListVideosResponse => ListVideosResponse.decode(value),
   },
   getVideo: {
-    path: "/stream.app.v1.VideosService/GetVideo",
+    path: "/stream.app.v1.Videos/GetVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: GetVideoRequest): Buffer => Buffer.from(GetVideoRequest.encode(value).finish()),
@@ -1116,7 +1116,7 @@ export const VideosServiceService = {
     responseDeserialize: (value: Buffer): GetVideoResponse => GetVideoResponse.decode(value),
   },
   updateVideo: {
-    path: "/stream.app.v1.VideosService/UpdateVideo",
+    path: "/stream.app.v1.Videos/UpdateVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: UpdateVideoRequest): Buffer => Buffer.from(UpdateVideoRequest.encode(value).finish()),
@@ -1125,7 +1125,7 @@ export const VideosServiceService = {
     responseDeserialize: (value: Buffer): UpdateVideoResponse => UpdateVideoResponse.decode(value),
   },
   deleteVideo: {
-    path: "/stream.app.v1.VideosService/DeleteVideo",
+    path: "/stream.app.v1.Videos/DeleteVideo",
     requestStream: false,
     responseStream: false,
     requestSerialize: (value: DeleteVideoRequest): Buffer => Buffer.from(DeleteVideoRequest.encode(value).finish()),
@@ -1135,7 +1135,7 @@ export const VideosServiceService = {
   },
 } as const;
 
-export interface VideosServiceServer extends UntypedServiceImplementation {
+export interface VideosServer extends UntypedServiceImplementation {
   getUploadUrl: handleUnaryCall<GetUploadUrlRequest, GetUploadUrlResponse>;
   createVideo: handleUnaryCall<CreateVideoRequest, CreateVideoResponse>;
   listVideos: handleUnaryCall<ListVideosRequest, ListVideosResponse>;
@@ -1144,7 +1144,7 @@ export interface VideosServiceServer extends UntypedServiceImplementation {
   deleteVideo: handleUnaryCall<DeleteVideoRequest, MessageResponse>;
 }
 
-export interface VideosServiceClient extends Client {
+export interface VideosClient extends Client {
   getUploadUrl(
     request: GetUploadUrlRequest,
     callback: (error: ServiceError | null, response: GetUploadUrlResponse) => void,
@@ -1237,12 +1237,9 @@ export interface VideosServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const VideosServiceClient = makeGenericClientConstructor(
-  VideosServiceService,
-  "stream.app.v1.VideosService",
-) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): VideosServiceClient;
-  service: typeof VideosServiceService;
+export const VideosClient = makeGenericClientConstructor(VideosService, "stream.app.v1.Videos") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): VideosClient;
+  service: typeof VideosService;
   serviceName: string;
 };
 
diff --git a/src/server/gen/proto/google/protobuf/timestamp.ts b/src/server/api/proto/google/protobuf/timestamp.ts
similarity index 100%
rename from src/server/gen/proto/google/protobuf/timestamp.ts
rename to src/server/api/proto/google/protobuf/timestamp.ts
diff --git a/src/server/gen/proto/google/protobuf/wrappers.ts b/src/server/api/proto/google/protobuf/wrappers.ts
similarity index 100%
rename from src/server/gen/proto/google/protobuf/wrappers.ts
rename to src/server/api/proto/google/protobuf/wrappers.ts
diff --git a/src/server/middlewares/authenticate.ts b/src/server/middlewares/authenticate.ts
index baeb2b1..2ded942 100644
--- a/src/server/middlewares/authenticate.ts
+++ b/src/server/middlewares/authenticate.ts
@@ -1,7 +1,7 @@
 import { MiddlewareHandler } from "hono";
 import { getCookie, setCookie } from "hono/cookie";
 import { HTTPException } from "hono/http-exception";
-import { buildInternalMetadata, getAccountServiceClient } from "../services/grpcClient";
+import { buildInternalMetadata, getAccountClient } from "../services/grpcClient";
 import { generateAndSetTokens } from "../utils";
 export const authenticate: MiddlewareHandler = async (ctx, next) => {
     let payload
@@ -36,7 +36,7 @@ export const authenticate: MiddlewareHandler = async (ctx, next) => {
             throw new HTTPException(401)
         }
         const metadata = buildInternalMetadata();
-        const user = await getAccountServiceClient().getUserById(userId, metadata);
+        const user = await getAccountClient().getUserById(userId, metadata);
         
         const tokenPair = await generateAndSetTokens(ctx, user);
         if (!user?.id || !user?.role || user.id !== userId) {
diff --git a/src/server/routes/auth.ts b/src/server/routes/auth.ts
index 56d23db..0fa2dd2 100644
--- a/src/server/routes/auth.ts
+++ b/src/server/routes/auth.ts
@@ -1,8 +1,8 @@
 import { Context, Hono } from "hono";
 import { deleteCookie, getCookie } from "hono/cookie";
 import { HTTPException } from "hono/http-exception";
-import { getAuthServiceClient, getInternalGrpcMetadata } from "../services/grpcClient";
-import type { User } from "@/server/gen/proto/app/v1/common";
+import { getAuthClient, getInternalGrpcMetadata } from "../services/grpcClient";
+import type { User } from "@/server/api/proto/app/v1/common";
 
 const authRoute = new Hono();
 
@@ -29,7 +29,7 @@ const forwardGrpcCookies = (c: Context, cookies: readonly string[]) => {
   }
 };
 
-const authService = () => getAuthServiceClient();
+const authService = () => getAuthClient();
 
 const googleAuthReasonMap: Record<string, string> = {
   access_denied: "access_denied",
diff --git a/src/server/routes/rpc/admin.ts b/src/server/routes/rpc/admin.ts
index a95b750..1a97940 100644
--- a/src/server/routes/rpc/admin.ts
+++ b/src/server/routes/rpc/admin.ts
@@ -6,7 +6,7 @@ const optionalTrimmed = () => z.string().trim().min(1).optional();
 export const adminMethods = {
     getAdminDashboard: async () => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     const response = await adminClient.getAdminDashboard({}, metadata);
     return response.dashboard ?? null;
@@ -20,7 +20,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminUsers(data, metadata);
   }),
@@ -34,7 +34,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminUser(data, metadata);
   }),
@@ -49,7 +49,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminUser(data, metadata);
   }),
@@ -59,7 +59,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.getAdminUser(data, metadata);
   }),
@@ -74,7 +74,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminUserReferralSettings(data, metadata);
   }),
@@ -85,7 +85,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminUserRole(data, metadata);
   }),
@@ -95,7 +95,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.deleteAdminUser(data, metadata);
   }),
@@ -109,7 +109,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminVideos(data, metadata);
   }),
@@ -127,7 +127,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminVideo(data, metadata);
   }),
@@ -146,7 +146,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminVideo(data, metadata);
   }),
@@ -156,7 +156,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.deleteAdminVideo(data, metadata);
   }),
@@ -169,7 +169,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminPayments(data, metadata);
   }),
@@ -183,7 +183,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminPayment(data, metadata);
   }),
@@ -194,13 +194,13 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminPayment(data, metadata);
   }),
   listAdminPlans: async () => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminPlans({}, metadata);
   },
@@ -217,7 +217,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminPlan(data, metadata);
   }),
@@ -235,7 +235,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminPlan(data, metadata);
   }),
@@ -245,7 +245,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.deleteAdminPlan(data, metadata);
   }),
@@ -258,7 +258,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminAdTemplates(data, metadata);
   }),
@@ -275,7 +275,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminAdTemplate(data, metadata);
   }),
@@ -293,7 +293,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminAdTemplate(data, metadata);
   }),
@@ -303,7 +303,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.deleteAdminAdTemplate(data, metadata);
   }),
@@ -316,7 +316,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminPlayerConfigs(data, metadata);
   }),
@@ -339,7 +339,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminPlayerConfig(data, metadata);
   }),
@@ -363,7 +363,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminPlayerConfig(data, metadata);
   }),
@@ -373,7 +373,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.deleteAdminPlayerConfig(data, metadata);
   }),
@@ -387,7 +387,7 @@ export const adminMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminJobs(data, metadata);
   }),
@@ -397,7 +397,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.getAdminJob(data, metadata);
   }),
@@ -407,7 +407,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.getAdminJobLogs(data, metadata);
   }),
@@ -423,7 +423,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.createAdminJob(data, metadata);
   }),
@@ -433,7 +433,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.cancelAdminJob(data, metadata);
   }),
@@ -443,13 +443,13 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.retryAdminJob(data, metadata);
   }),
   listAdminAgents: async () => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.listAdminAgents({}, metadata);
   },
@@ -459,7 +459,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.restartAdminAgent(data, metadata);
   }),
@@ -469,7 +469,7 @@ export const adminMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adminClient = context.get("adminServiceClient");
+    const adminClient = context.get("adminClient");
     const metadata = context.get("grpcMetadata");
     return await adminClient.updateAdminAgent(data, metadata);
   }),
diff --git a/src/server/routes/rpc/auth.ts b/src/server/routes/rpc/auth.ts
index 7719814..425326b 100644
--- a/src/server/routes/rpc/auth.ts
+++ b/src/server/routes/rpc/auth.ts
@@ -23,7 +23,7 @@ export const publicAuthMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
     const response = await authClient.login(data, metadata, {
       onMetadata: collectGrpcCookies,
@@ -40,7 +40,7 @@ export const publicAuthMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
     const response = await authClient.register({
       email: data.email,
@@ -57,7 +57,7 @@ export const publicAuthMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
     const response = await authClient.forgotPassword(data, metadata);
     return { message: response.message || "If email exists, a reset link has been sent" };
@@ -69,14 +69,14 @@ export const publicAuthMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
     const response = await authClient.resetPassword(data, metadata);
     return { message: response.message || "Password reset successfully" };
   }),
   getGoogleLoginUrl: async () => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
     return await authClient.getGoogleLoginUrl({}, metadata);
   },
@@ -90,14 +90,14 @@ export const protectedAuthMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("grpcMetadata");
     const response = await authClient.changePassword(data, metadata);
     return { message: response.message || "Password changed successfully" };
   }),
   logout: async () => {
     const context = getContext();
-    const authClient = context.get("authServiceClient");
+    const authClient = context.get("authClient");
     const metadata = context.get("internalGrpcMetadata");
 
     await authClient.logout({}, metadata);
diff --git a/src/server/routes/rpc/me.ts b/src/server/routes/rpc/me.ts
index 8e43a44..dc756ad 100644
--- a/src/server/routes/rpc/me.ts
+++ b/src/server/routes/rpc/me.ts
@@ -9,7 +9,7 @@ const optionalTrimmed = () => z.string().trim().min(1).optional();
 export const meMethods = {
   getMe: async () => {
     const context = getContext();
-    const accountClient = context.get("accountServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
     const response = await accountClient.getMe({}, metadata);
     return response.user ?? null;
@@ -23,20 +23,20 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const accountClient = context.get("accountServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
     const response = await accountClient.updateMe(data, metadata);
     return response.user ?? null;
   }),
   deleteMe: async () => {
     const context = getContext();
-    const accountClient = context.get("accountServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
     return await accountClient.deleteMe({}, metadata);
   },
   clearMyData: async () => {
     const context = getContext();
-    const accountClient = context.get("accountServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
     return await accountClient.clearMyData({}, metadata);
   },
@@ -49,7 +49,7 @@ export const meMethods = {
     }).optional().default({}),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.listVideos(data, metadata);
   }),
@@ -59,7 +59,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.getVideo(data, metadata);
   }),
@@ -76,7 +76,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.updateVideo(data, metadata);
   }),
@@ -86,13 +86,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.deleteVideo(data, metadata);
   }),
   listAdTemplates: async () => {
     const context = getContext();
-    const adTemplatesClient = context.get("adTemplatesServiceClient");
+    const adTemplatesClient = context.get("adTemplatesClient");
     const metadata = context.get("grpcMetadata");
     return await adTemplatesClient.listAdTemplates({}, metadata);
   },
@@ -108,7 +108,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adTemplatesClient = context.get("adTemplatesServiceClient");
+    const adTemplatesClient = context.get("adTemplatesClient");
     const metadata = context.get("grpcMetadata");
     return await adTemplatesClient.createAdTemplate(data, metadata);
   }),
@@ -125,7 +125,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adTemplatesClient = context.get("adTemplatesServiceClient");
+    const adTemplatesClient = context.get("adTemplatesClient");
     const metadata = context.get("grpcMetadata");
     return await adTemplatesClient.updateAdTemplate(data, metadata);
   }),
@@ -135,13 +135,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const adTemplatesClient = context.get("adTemplatesServiceClient");
+    const adTemplatesClient = context.get("adTemplatesClient");
     const metadata = context.get("grpcMetadata");
     return await adTemplatesClient.deleteAdTemplate(data, metadata);
   }),
   listPlayerConfigs: async () => {
     const context = getContext();
-    const playerConfigsClient = context.get("playerConfigsServiceClient");
+    const playerConfigsClient = context.get("playerConfigsClient");
     const metadata = context.get("grpcMetadata");
     return await playerConfigsClient.listPlayerConfigs({}, metadata);
   },
@@ -163,7 +163,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const playerConfigsClient = context.get("playerConfigsServiceClient");
+    const playerConfigsClient = context.get("playerConfigsClient");
     const metadata = context.get("grpcMetadata");
     return await playerConfigsClient.createPlayerConfig(data, metadata);
   }),
@@ -186,7 +186,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const playerConfigsClient = context.get("playerConfigsServiceClient");
+    const playerConfigsClient = context.get("playerConfigsClient");
     const metadata = context.get("grpcMetadata");
     return await playerConfigsClient.updatePlayerConfig(data, metadata);
   }),
@@ -196,15 +196,15 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const playerConfigsClient = context.get("playerConfigsServiceClient");
+    const playerConfigsClient = context.get("playerConfigsClient");
     const metadata = context.get("grpcMetadata");
     return await playerConfigsClient.deletePlayerConfig(data, metadata);
   }),
   getPreferences: async () => {
     const context = getContext();
-    const preferencesClient = context.get("preferencesServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
-    return await preferencesClient.getPreferences({}, metadata);
+    return await accountClient.getPreferences({}, metadata);
   },
   updatePreferences: validateFn(
     z.object({
@@ -217,13 +217,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const preferencesClient = context.get("preferencesServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
-    return await preferencesClient.updatePreferences(data, metadata);
+    return await accountClient.updatePreferences(data, metadata);
   }),
   listNotifications: async () => {
     const context = getContext();
-    const notificationsClient = context.get("notificationsServiceClient");
+    const notificationsClient = context.get("notificationsClient");
     const metadata = context.get("grpcMetadata");
     return await notificationsClient.listNotifications({}, metadata);
   },
@@ -233,13 +233,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const notificationsClient = context.get("notificationsServiceClient");
+    const notificationsClient = context.get("notificationsClient");
     const metadata = context.get("grpcMetadata");
     return await notificationsClient.markNotificationRead(data, metadata);
   }),
   markAllNotificationsRead: async () => {
     const context = getContext();
-    const notificationsClient = context.get("notificationsServiceClient");
+    const notificationsClient = context.get("notificationsClient");
     const metadata = context.get("grpcMetadata");
     return await notificationsClient.markAllNotificationsRead({}, metadata);
   },
@@ -249,13 +249,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const notificationsClient = context.get("notificationsServiceClient");
+    const notificationsClient = context.get("notificationsClient");
     const metadata = context.get("grpcMetadata");
     return await notificationsClient.deleteNotification(data, metadata);
   }),
   clearNotifications: async () => {
     const context = getContext();
-    const notificationsClient = context.get("notificationsServiceClient");
+    const notificationsClient = context.get("notificationsClient");
     const metadata = context.get("grpcMetadata");
     return await notificationsClient.clearNotifications({}, metadata);
   },
@@ -265,7 +265,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.getUploadUrl(data, metadata);
   }),
@@ -280,19 +280,19 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const videosClient = context.get("videosServiceClient");
+    const videosClient = context.get("videosClient");
     const metadata = context.get("grpcMetadata");
     return await videosClient.createVideo(data, metadata);
   }),
   getUsage: async () => {
     const context = getContext();
-    const usageClient = context.get("usageServiceClient");
+    const accountClient = context.get("accountClient");
     const metadata = context.get("grpcMetadata");
-    return await usageClient.getUsage({}, metadata);
+    return await accountClient.getUsage({}, metadata);
   },
   listDomains: async () => {
     const context = getContext();
-    const domainsClient = context.get("domainsServiceClient");
+    const domainsClient = context.get("domainsClient");
     const metadata = context.get("grpcMetadata");
     return await domainsClient.listDomains({}, metadata);
   },
@@ -302,7 +302,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const domainsClient = context.get("domainsServiceClient");
+    const domainsClient = context.get("domainsClient");
     const metadata = context.get("grpcMetadata");
     return await domainsClient.createDomain(data, metadata);
   }),
@@ -312,13 +312,13 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const domainsClient = context.get("domainsServiceClient");
+    const domainsClient = context.get("domainsClient");
     const metadata = context.get("grpcMetadata");
     return await domainsClient.deleteDomain(data, metadata);
   }),
   listPlans: async () => {
     const context = getContext();
-    const plansClient = context.get("plansServiceClient");
+    const plansClient = context.get("plansClient");
     const metadata = context.get("grpcMetadata");
     return await plansClient.listPlans({}, metadata);
   },
@@ -327,7 +327,7 @@ export const meMethods = {
     z.number().int().min(1).max(100).optional(),
   )(async (page, limit) => {
     const context = getContext();
-    const paymentsClient = context.get("paymentsServiceClient");
+    const paymentsClient = context.get("paymentsClient");
     const metadata = context.get("grpcMetadata");
     return await paymentsClient.listPaymentHistory({ page, limit }, metadata);
   }),
@@ -340,7 +340,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const paymentsClient = context.get("paymentsServiceClient");
+    const paymentsClient = context.get("paymentsClient");
     const metadata = context.get("grpcMetadata");
     return await paymentsClient.createPayment(data, metadata);
   }),
@@ -350,7 +350,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const paymentsClient = context.get("paymentsServiceClient");
+    const paymentsClient = context.get("paymentsClient");
     const metadata = context.get("grpcMetadata");
     return await paymentsClient.topupWallet(data, metadata);
   }),
@@ -360,7 +360,7 @@ export const meMethods = {
     }),
   )(async (data) => {
     const context = getContext();
-    const paymentsClient = context.get("paymentsServiceClient");
+    const paymentsClient = context.get("paymentsClient");
     const metadata = context.get("grpcMetadata");
     return await paymentsClient.downloadInvoice(data, metadata);
   }),
diff --git a/src/server/services/grpcClient.ts b/src/server/services/grpcClient.ts
index c754789..f2d92b6 100644
--- a/src/server/services/grpcClient.ts
+++ b/src/server/services/grpcClient.ts
@@ -1,39 +1,35 @@
 import {
-  AccountServiceClient,
-  NotificationsServiceClient,
-  PreferencesServiceClient,
-  UsageServiceClient,
-  type AccountServiceClient as AccountServiceClientType,
-  type NotificationsServiceClient as NotificationsServiceClientType,
-  type PreferencesServiceClient as PreferencesServiceClientType,
-  type UsageServiceClient as UsageServiceClientType,
-} from "@/server/gen/proto/app/v1/account";
+  AccountClient,
+  NotificationsClient,
+  type AccountClient as AccountClientType,
+  type NotificationsClient as NotificationsClientType,
+} from "@/server/api/proto/app/v1/account";
 import {
-  AdminServiceClient,
-  type AdminServiceClient as AdminServiceClientType,
-} from "@/server/gen/proto/app/v1/admin";
+  AdminClient,
+  type AdminClient as AdminClientType,
+} from "@/server/api/proto/app/v1/admin";
 import {
-  AuthServiceClient,
-  type AuthServiceClient as AuthServiceClientType,
-} from "@/server/gen/proto/app/v1/auth";
+  AuthClient,
+  type AuthClient as AuthClientType,
+} from "@/server/api/proto/app/v1/auth";
 import {
-  AdTemplatesServiceClient,
-  DomainsServiceClient,
-  PlayerConfigsServiceClient,
-  PlansServiceClient,
-  type AdTemplatesServiceClient as AdTemplatesServiceClientType,
-  type DomainsServiceClient as DomainsServiceClientType,
-  type PlayerConfigsServiceClient as PlayerConfigsServiceClientType,
-  type PlansServiceClient as PlansServiceClientType,
-} from "@/server/gen/proto/app/v1/catalog";
+  AdTemplatesClient,
+  DomainsClient,
+  PlayerConfigsClient,
+  PlansClient,
+  type AdTemplatesClient as AdTemplatesClientType,
+  type DomainsClient as DomainsClientType,
+  type PlayerConfigsClient as PlayerConfigsClientType,
+  type PlansClient as PlansClientType,
+} from "@/server/api/proto/app/v1/catalog";
 import {
-  PaymentsServiceClient,
-  type PaymentsServiceClient as PaymentsServiceClientType,
-} from "@/server/gen/proto/app/v1/payments";
+  PaymentsClient,
+  type PaymentsClient as PaymentsClientType,
+} from "@/server/api/proto/app/v1/payments";
 import {
-  VideosServiceClient,
-  type VideosServiceClient as VideosServiceClientType,
-} from "@/server/gen/proto/app/v1/videos";
+  VideosClient,
+  type VideosClient as VideosClientType,
+} from "@/server/api/proto/app/v1/videos";
 import { ChannelCredentials, Metadata, credentials } from "@grpc/grpc-js";
 import type { Hono } from "hono";
 import { tryGetContext } from "hono/context-storage";
@@ -41,18 +37,16 @@ import { PromisifiedClient, promisifyClient } from "../utils/grpcHelper";
 
 declare module "hono" {
   interface ContextVariableMap {
-    accountServiceClient: PromisifiedClient<AccountServiceClientType>;
-    authServiceClient: PromisifiedClient<AuthServiceClientType>;
-    adminServiceClient: PromisifiedClient<AdminServiceClientType>;
-    adTemplatesServiceClient: PromisifiedClient<AdTemplatesServiceClientType>;
-    videosServiceClient: PromisifiedClient<VideosServiceClientType>;
-    domainsServiceClient: PromisifiedClient<DomainsServiceClientType>;
-    playerConfigsServiceClient: PromisifiedClient<PlayerConfigsServiceClientType>;
-    plansServiceClient: PromisifiedClient<PlansServiceClientType>;
-    paymentsServiceClient: PromisifiedClient<PaymentsServiceClientType>;
-    preferencesServiceClient: PromisifiedClient<PreferencesServiceClientType>;
-    notificationsServiceClient: PromisifiedClient<NotificationsServiceClientType>;
-    usageServiceClient: PromisifiedClient<UsageServiceClientType>;
+    accountClient: PromisifiedClient<AccountClientType>;
+    authClient: PromisifiedClient<AuthClientType>;
+    adminClient: PromisifiedClient<AdminClientType>;
+    adTemplatesClient: PromisifiedClient<AdTemplatesClientType>;
+    videosClient: PromisifiedClient<VideosClientType>;
+    domainsClient: PromisifiedClient<DomainsClientType>;
+    playerConfigsClient: PromisifiedClient<PlayerConfigsClientType>;
+    plansClient: PromisifiedClient<PlansClientType>;
+    paymentsClient: PromisifiedClient<PaymentsClientType>;
+    notificationsClient: PromisifiedClient<NotificationsClientType>;
     internalGrpcMetadata: Metadata;
   }
 }
@@ -119,100 +113,84 @@ const buildActorMetadata = () => {
   return metadata;
 };
 
-export const getAccountServiceClient = () => {
+export const getAccountClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get AccountServiceClient");
+    throw new Error("No context available to get AccountClient");
   }
-  return context.get("accountServiceClient");
+  return context.get("accountClient");
 };
 
-export const getAuthServiceClient = () => {
+export const getAuthClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get AuthServiceClient");
+    throw new Error("No context available to get AuthClient");
   }
-  return context.get("authServiceClient");
+  return context.get("authClient");
 };
 
-export const getAdminServiceClient = () => {
+export const getAdminClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get AdminServiceClient");
+    throw new Error("No context available to get AdminClient");
   }
-  return context.get("adminServiceClient");
+  return context.get("adminClient");
 };
 
-export const getAdTemplatesServiceClient = () => {
+export const getAdTemplatesClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get AdTemplatesServiceClient");
+    throw new Error("No context available to get AdTemplatesClient");
   }
-  return context.get("adTemplatesServiceClient");
+  return context.get("adTemplatesClient");
 };
 
-export const getVideosServiceClient = () => {
+export const getVideosClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get VideosServiceClient");
+    throw new Error("No context available to get VideosClient");
   }
-  return context.get("videosServiceClient");
+  return context.get("videosClient");
 };
 
-export const getDomainsServiceClient = () => {
+export const getDomainsClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get DomainsServiceClient");
+    throw new Error("No context available to get DomainsClient");
   }
-  return context.get("domainsServiceClient");
+  return context.get("domainsClient");
 };
 
-export const getPlayerConfigsServiceClient = () => {
+export const getPlayerConfigsClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get PlayerConfigsServiceClient");
+    throw new Error("No context available to get PlayerConfigsClient");
   }
-  return context.get("playerConfigsServiceClient");
+  return context.get("playerConfigsClient");
 };
 
-export const getPlansServiceClient = () => {
+export const getPlansClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get PlansServiceClient");
+    throw new Error("No context available to get PlansClient");
   }
-  return context.get("plansServiceClient");
+  return context.get("plansClient");
 };
 
-export const getPaymentsServiceClient = () => {
+export const getPaymentsClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get PaymentsServiceClient");
+    throw new Error("No context available to get PaymentsClient");
   }
-  return context.get("paymentsServiceClient");
+  return context.get("paymentsClient");
 };
 
-export const getPreferencesServiceClient = () => {
+export const getNotificationsClient = () => {
   const context = tryGetContext();
   if (!context) {
-    throw new Error("No context available to get PreferencesServiceClient");
+    throw new Error("No context available to get NotificationsClient");
   }
-  return context.get("preferencesServiceClient");
-};
-
-export const getNotificationsServiceClient = () => {
-  const context = tryGetContext();
-  if (!context) {
-    throw new Error("No context available to get NotificationsServiceClient");
-  }
-  return context.get("notificationsServiceClient");
-};
-
-export const getUsageServiceClient = () => {
-  const context = tryGetContext();
-  if (!context) {
-    throw new Error("No context available to get UsageServiceClient");
-  }
-  return context.get("usageServiceClient");
+  return context.get("notificationsClient");
 };
 
 export const getGrpcMetadataFromContext = () => buildActorMetadata();
@@ -223,31 +201,27 @@ export const setupServices = (app: Hono) => {
   app.use("*", async (c, next) => {
     const creds = getCredentials();
 
-    const accountClient = new AccountServiceClient(grpcAddress(), creds);
-    const authClient = new AuthServiceClient(grpcAddress(), creds);
-    const adminClient = new AdminServiceClient(grpcAddress(), creds);
-    const adTemplatesClient = new AdTemplatesServiceClient(grpcAddress(), creds);
-    const videosClient = new VideosServiceClient(grpcAddress(), creds);
-    const domainsClient = new DomainsServiceClient(grpcAddress(), creds);
-    const playerConfigsClient = new PlayerConfigsServiceClient(grpcAddress(), creds);
-    const plansClient = new PlansServiceClient(grpcAddress(), creds);
-    const paymentsClient = new PaymentsServiceClient(grpcAddress(), creds);
-    const preferencesClient = new PreferencesServiceClient(grpcAddress(), creds);
-    const notificationsClient = new NotificationsServiceClient(grpcAddress(), creds);
-    const usageClient = new UsageServiceClient(grpcAddress(), creds);
+    const accountClient = new AccountClient(grpcAddress(), creds);
+    const authClient = new AuthClient(grpcAddress(), creds);
+    const adminClient = new AdminClient(grpcAddress(), creds);
+    const adTemplatesClient = new AdTemplatesClient(grpcAddress(), creds);
+    const videosClient = new VideosClient(grpcAddress(), creds);
+    const domainsClient = new DomainsClient(grpcAddress(), creds);
+    const playerConfigsClient = new PlayerConfigsClient(grpcAddress(), creds);
+    const plansClient = new PlansClient(grpcAddress(), creds);
+    const paymentsClient = new PaymentsClient(grpcAddress(), creds);
+    const notificationsClient = new NotificationsClient(grpcAddress(), creds);
 
-    c.set("accountServiceClient", promisifyClient(accountClient));
-    c.set("authServiceClient", promisifyClient(authClient));
-    c.set("adminServiceClient", promisifyClient(adminClient));
-    c.set("adTemplatesServiceClient", promisifyClient(adTemplatesClient));
-    c.set("videosServiceClient", promisifyClient(videosClient));
-    c.set("domainsServiceClient", promisifyClient(domainsClient));
-    c.set("playerConfigsServiceClient", promisifyClient(playerConfigsClient));
-    c.set("plansServiceClient", promisifyClient(plansClient));
-    c.set("paymentsServiceClient", promisifyClient(paymentsClient));
-    c.set("preferencesServiceClient", promisifyClient(preferencesClient));
-    c.set("notificationsServiceClient", promisifyClient(notificationsClient));
-    c.set("usageServiceClient", promisifyClient(usageClient));
+    c.set("accountClient", promisifyClient(accountClient));
+    c.set("authClient", promisifyClient(authClient));
+    c.set("adminClient", promisifyClient(adminClient));
+    c.set("adTemplatesClient", promisifyClient(adTemplatesClient));
+    c.set("videosClient", promisifyClient(videosClient));
+    c.set("domainsClient", promisifyClient(domainsClient));
+    c.set("playerConfigsClient", promisifyClient(playerConfigsClient));
+    c.set("plansClient", promisifyClient(plansClient));
+    c.set("paymentsClient", promisifyClient(paymentsClient));
+    c.set("notificationsClient", promisifyClient(notificationsClient));
     c.set("internalGrpcMetadata", getInternalGrpcMetadata());
 
     await next();
diff --git a/src/server/utils/index.ts b/src/server/utils/index.ts
index aa6de07..3a98d00 100644
--- a/src/server/utils/index.ts
+++ b/src/server/utils/index.ts
@@ -1,4 +1,4 @@
-import type { User } from "@/server/gen/proto/app/v1/common";
+import type { User } from "@/server/api/proto/app/v1/common";
 import { TinyRpcError } from "@hiogawa/tiny-rpc";
 import { tinyassert } from "@hiogawa/utils";
 import { Context } from "hono";
diff --git a/src/server/utils/proto/v1/user.ts b/src/server/utils/proto/v1/user.ts
index 90380ee..566478c 100644
--- a/src/server/utils/proto/v1/user.ts
+++ b/src/server/utils/proto/v1/user.ts
@@ -1985,7 +1985,7 @@ export interface UserServiceServer extends UntypedServiceImplementation {
   upsertPreferences: handleUnaryCall<UpsertPreferencesRequest, UpsertPreferencesResponse>;
 }
 
-export interface UserServiceClient extends Client {
+export interface UserClient extends Client {
   /** User CRUD */
   getUser(
     request: GetUserRequest,
@@ -2125,11 +2125,11 @@ export interface UserServiceClient extends Client {
   ): ClientUnaryCall;
 }
 
-export const UserServiceClient = makeGenericClientConstructor(
+export const UserClient = makeGenericClientConstructor(
   UserServiceService,
   "stream.User.v1.UserService",
 ) as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): UserServiceClient;
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): UserClient;
   service: typeof UserServiceService;
   serviceName: string;
 };
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 4736e61..3649f04 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -1,6 +1,6 @@
 import { client as rpcClient } from "@/api/rpcclient";
 import { TinyMqttClient } from "@/lib/liteMqtt";
-import type { User } from "@/server/gen/proto/app/v1/common";
+import type { User } from "@/server/api/proto/app/v1/common";
 import { useTranslation } from "i18next-vue";
 import { defineStore } from "pinia";
 import { computed, ref, watch } from "vue";