♻️ refactor: refactor server db schema for better code organize (#3410)

* refactor schema

* fix lint

* fix

* update drizzle-kit

* clean code

drizzle.config.ts

@@ -24,6 +24,6 @@ export default {
   dialect: 'postgresql',
   out: './src/database/server/migrations',
 
-  schema: './src/database/server/schemas/lobechat.ts',
+  schema: './src/database/server/schemas/lobechat',
   strict: true,
 } satisfies Config;

src/database/server/schemas/_id.ts

@@ -1,15 +0,0 @@
-// refs: https://unkey.dev/blog/uuid-ux
-
-// If I have 100 million users, each generating up to 1 million messages.
-// Then the total number of IDs that need to be generated: 100 million × 1 million = 10^14 (100 trillion)
-// 11-digit Nano ID: 36^11 ≈ 1.3 × 10^17 (130 trillion trillion)
-
-export const FILE_ID_LENGTH = 19; // 5 prefix + 14 random, e.g. file_ydGX5gmaxL32fh
-
-export const MESSAGE_ID_LENGTH = 18; // 4 prefix + 14 random, e.g. msg_GX5ymaxL3d2ds2
-
-export const SESSION_ID_LENGTH = 16; // 4 prefix + 12 random, e.g. ssn_GX5y3d2dmaxL
-
-export const TOPIC_ID_LENGTH = 16; // 4 prefix + 12 random, e.g. tpc_GX5ymd7axL3y
-
-export const USER_ID_LENGTH = 14; // 4 prefix + 10 random, e.g. user_GXyxLmd75a

src/database/server/schemas/lobechat/_helpers.ts

@@ -0,0 +1,6 @@
+import { timestamp } from 'drizzle-orm/pg-core';
+
+export const timestamptz = (name: string) => timestamp(name, { withTimezone: true });
+
+export const createdAt = () => timestamptz('created_at').notNull().defaultNow();
+export const updatedAt = () => timestamptz('updated_at').notNull().defaultNow();

src/database/server/schemas/lobechat/chat.ts

@@ -1,6 +1,5 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix  */
 import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
-import { relations } from 'drizzle-orm';
 import {
   boolean,
   index,
@@ -8,177 +7,20 @@ import {
   jsonb,
   pgTable,
   primaryKey,
-  serial,
   text,
-  timestamp,
   unique,
   uniqueIndex,
   varchar,
 } from 'drizzle-orm/pg-core';
 import { createInsertSchema, createSelectSchema } from 'drizzle-zod';
 
-import { DEFAULT_PREFERENCE } from '@/const/user';
 import { LobeAgentChatConfig, LobeAgentTTSConfig } from '@/types/agent';
 import { CustomPluginParams } from '@/types/tool/plugin';
 
-import { idGenerator, randomSlug } from '../utils/idGenerator';
-
-// Schema for nextauth
-export * from './nextauth';
-
-const timestamptz = (name: string) => timestamp(name, { withTimezone: true });
-
-const createdAt = () => timestamptz('created_at').notNull().defaultNow();
-const updatedAt = () => timestamptz('updated_at').notNull().defaultNow();
-
-/**
- * This table stores users. Users are created in Clerk, then Clerk calls a
- * webhook at /api/webhook/clerk to inform this application a user was created.
- */
-export const users = pgTable('users', {
-  // The ID will be the user's ID from Clerk
-  id: text('id').primaryKey().notNull(),
-  username: text('username').unique(),
-  email: text('email'),
-
-  avatar: text('avatar'),
-  phone: text('phone'),
-  firstName: text('first_name'),
-  lastName: text('last_name'),
-  fullName: text('full_name'),
-
-  isOnboarded: boolean('is_onboarded').default(false),
-  // Time user was created in Clerk
-  clerkCreatedAt: timestamptz('clerk_created_at'),
-
-  // Required by nextauth, all null allowed
-  emailVerifiedAt: timestamptz('email_verified_at'),
-
-  preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUser = typeof users.$inferInsert;
-export type UserItem = typeof users.$inferSelect;
-
-export const userSubscriptions = pgTable('user_subscriptions', {
-  id: text('id').primaryKey().notNull(),
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-  stripeId: text('stripe_id'),
-
-  currency: text('currency'),
-  pricing: integer('pricing'),
-  billingPaidAt: integer('billing_paid_at'),
-  billingCycleStart: integer('billing_cycle_start'),
-  billingCycleEnd: integer('billing_cycle_end'),
-
-  cancelAtPeriodEnd: boolean('cancel_at_period_end'),
-  cancelAt: integer('cancel_at'),
-
-  nextBilling: jsonb('next_billing'),
-
-  plan: text('plan'),
-  recurring: text('recurring'),
-
-  storageLimit: integer('storage_limit'),
-
-  status: integer('status'),
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUserSubscription = typeof userSubscriptions.$inferInsert;
-export type UserSubscriptionItem = typeof userSubscriptions.$inferSelect;
-
-export const userBudgets = pgTable('user_budgets', {
-  id: text('id')
-    .primaryKey()
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  freeBudgetId: text('free_budget_id'),
-  freeBudgetKey: text('free_budget_key'),
-
-  subscriptionBudgetId: text('subscription_budget_id'),
-  subscriptionBudgetKey: text('subscription_budget_key'),
-
-  packageBudgetId: text('package_budget_id'),
-  packageBudgetKey: text('package_budget_key'),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUserBudgets = typeof userBudgets.$inferInsert;
-export type UserBudgetItem = typeof userBudgets.$inferSelect;
-
-export const userSettings = pgTable('user_settings', {
-  id: text('id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .primaryKey(),
-
-  tts: jsonb('tts'),
-  keyVaults: text('key_vaults'),
-  general: jsonb('general'),
-  languageModel: jsonb('language_model'),
-  systemAgent: jsonb('system_agent'),
-  defaultAgent: jsonb('default_agent'),
-  tool: jsonb('tool'),
-});
-
-export const tags = pgTable('tags', {
-  id: serial('id').primaryKey(),
-  slug: text('slug').notNull().unique(),
-  name: text('name'),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export const files = pgTable('files', {
-  id: text('id')
-    .$defaultFn(() => idGenerator('files'))
-    .primaryKey(),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-  fileType: varchar('file_type', { length: 255 }).notNull(),
-  name: text('name').notNull(),
-  size: integer('size').notNull(),
-  url: text('url').notNull(),
-
-  metadata: jsonb('metadata'),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewFile = typeof files.$inferInsert;
-export type FileItem = typeof files.$inferSelect;
-
-export const plugins = pgTable('plugins', {
-  id: serial('id').primaryKey(),
-  identifier: text('identifier').notNull().unique(),
-
-  title: text('title').notNull(),
-  description: text('description'),
-  avatar: text('avatar'),
-  author: text('author'),
-
-  manifest: text('manifest').notNull(),
-  locale: text('locale').notNull(),
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
+import { idGenerator, randomSlug } from '../../utils/idGenerator';
+import { createdAt, updatedAt } from './_helpers';
+import { files } from './file';
+import { users } from './user';
 
 export const installedPlugins = pgTable(
   'user_installed_plugins',
@@ -204,21 +46,6 @@ export const installedPlugins = pgTable(
 export type NewInstalledPlugin = typeof installedPlugins.$inferInsert;
 export type InstalledPluginItem = typeof installedPlugins.$inferSelect;
 
-export const pluginsTags = pgTable(
-  'plugins_tags',
-  {
-    pluginId: integer('plugin_id')
-      .notNull()
-      .references(() => plugins.id, { onDelete: 'cascade' }),
-    tagId: integer('tag_id')
-      .notNull()
-      .references(() => tags.id, { onDelete: 'cascade' }),
-  },
-  (t) => ({
-    pk: primaryKey({ columns: [t.pluginId, t.tagId] }),
-  }),
-);
-
 //  ======= agents ======= //
 export const agents = pgTable('agents', {
   id: text('id')
@@ -252,47 +79,11 @@ export const agents = pgTable('agents', {
   updatedAt: updatedAt(),
 });
 
-export const agentsTags = pgTable(
-  'agents_tags',
-  {
-    agentId: text('agent_id')
-      .notNull()
-      .references(() => agents.id, { onDelete: 'cascade' }),
-    tagId: integer('tag_id')
-      .notNull()
-      .references(() => tags.id, { onDelete: 'cascade' }),
-  },
-  (t) => ({
-    pk: primaryKey({ columns: [t.agentId, t.tagId] }),
-  }),
-);
 export const insertAgentSchema = createInsertSchema(agents);
 
 export type NewAgent = typeof agents.$inferInsert;
 export type AgentItem = typeof agents.$inferSelect;
 
-//  ======= market ======= //
-
-export const market = pgTable('market', {
-  id: serial('id').primaryKey(),
-
-  agentId: text('agent_id').references(() => agents.id, { onDelete: 'cascade' }),
-  pluginId: integer('plugin_id').references(() => plugins.id, { onDelete: 'cascade' }),
-
-  type: text('type', { enum: ['plugin', 'model', 'agent', 'group'] }).notNull(),
-
-  view: integer('view').default(0),
-  like: integer('like').default(0),
-  used: integer('used').default(0),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
 //  ======= sessionGroups ======= //
 
 export const sessionGroups = pgTable(
@@ -538,125 +329,3 @@ export const filesToAgents = pgTable(
     pk: primaryKey({ columns: [t.fileId, t.agentId] }),
   }),
 );
-
-export const filesRelations = relations(files, ({ many }) => ({
-  filesToMessages: many(filesToMessages),
-  filesToSessions: many(filesToSessions),
-  filesToAgents: many(filesToAgents),
-}));
-
-export const topicRelations = relations(topics, ({ one }) => ({
-  session: one(sessions, {
-    fields: [topics.sessionId],
-    references: [sessions.id],
-  }),
-}));
-
-export const pluginsRelations = relations(plugins, ({ many }) => ({
-  pluginsTags: many(pluginsTags),
-}));
-
-export const pluginsTagsRelations = relations(pluginsTags, ({ one }) => ({
-  plugin: one(plugins, {
-    fields: [pluginsTags.pluginId],
-    references: [plugins.id],
-  }),
-  tag: one(tags, {
-    fields: [pluginsTags.tagId],
-    references: [tags.id],
-  }),
-}));
-
-export const tagsRelations = relations(tags, ({ many }) => ({
-  agentsTags: many(agentsTags),
-  pluginsTags: many(pluginsTags),
-}));
-
-export const messagesRelations = relations(messages, ({ many, one }) => ({
-  filesToMessages: many(filesToMessages),
-
-  session: one(sessions, {
-    fields: [messages.sessionId],
-    references: [sessions.id],
-  }),
-
-  parent: one(messages, {
-    fields: [messages.parentId],
-    references: [messages.id],
-  }),
-
-  topic: one(topics, {
-    fields: [messages.topicId],
-    references: [topics.id],
-  }),
-}));
-
-export const agentsRelations = relations(agents, ({ many }) => ({
-  agentsToSessions: many(agentsToSessions),
-  filesToAgents: many(filesToAgents),
-  agentsTags: many(agentsTags),
-}));
-
-export const agentsToSessionsRelations = relations(agentsToSessions, ({ one }) => ({
-  session: one(sessions, {
-    fields: [agentsToSessions.sessionId],
-    references: [sessions.id],
-  }),
-  agent: one(agents, {
-    fields: [agentsToSessions.agentId],
-    references: [agents.id],
-  }),
-}));
-
-export const filesToAgentsRelations = relations(filesToAgents, ({ one }) => ({
-  agent: one(agents, {
-    fields: [filesToAgents.agentId],
-    references: [agents.id],
-  }),
-  file: one(files, {
-    fields: [filesToAgents.fileId],
-    references: [files.id],
-  }),
-}));
-
-export const filesToMessagesRelations = relations(filesToMessages, ({ one }) => ({
-  file: one(files, {
-    fields: [filesToMessages.fileId],
-    references: [files.id],
-  }),
-  message: one(messages, {
-    fields: [filesToMessages.messageId],
-    references: [messages.id],
-  }),
-}));
-
-export const filesToSessionsRelations = relations(filesToSessions, ({ one }) => ({
-  file: one(files, {
-    fields: [filesToSessions.fileId],
-    references: [files.id],
-  }),
-  session: one(sessions, {
-    fields: [filesToSessions.sessionId],
-    references: [sessions.id],
-  }),
-}));
-
-export const agentsTagsRelations = relations(agentsTags, ({ one }) => ({
-  agent: one(agents, {
-    fields: [agentsTags.agentId],
-    references: [agents.id],
-  }),
-  tag: one(tags, {
-    fields: [agentsTags.tagId],
-    references: [tags.id],
-  }),
-}));
-
-export const sessionsRelations = relations(sessions, ({ many, one }) => ({
-  filesToSessions: many(filesToSessions),
-  agentsToSessions: many(agentsToSessions),
-  group: one(sessionGroups, {
-    fields: [sessions.groupId],
-    references: [sessionGroups.id],
-  }),
-}));

src/database/server/schemas/lobechat/discover.ts

@@ -0,0 +1,84 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { integer, pgTable, primaryKey, serial, text } from 'drizzle-orm/pg-core';
+
+import { createdAt, updatedAt } from './_helpers';
+import { agents } from './chat';
+import { users } from './user';
+
+export const tags = pgTable('tags', {
+  id: serial('id').primaryKey(),
+  slug: text('slug').notNull().unique(),
+  name: text('name'),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export const plugins = pgTable('plugins', {
+  id: serial('id').primaryKey(),
+  identifier: text('identifier').notNull().unique(),
+
+  title: text('title').notNull(),
+  description: text('description'),
+  avatar: text('avatar'),
+  author: text('author'),
+
+  manifest: text('manifest').notNull(),
+  locale: text('locale').notNull(),
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export const pluginsTags = pgTable(
+  'plugins_tags',
+  {
+    pluginId: integer('plugin_id')
+      .notNull()
+      .references(() => plugins.id, { onDelete: 'cascade' }),
+    tagId: integer('tag_id')
+      .notNull()
+      .references(() => tags.id, { onDelete: 'cascade' }),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.pluginId, t.tagId] }),
+  }),
+);
+
+export const agentsTags = pgTable(
+  'agents_tags',
+  {
+    agentId: text('agent_id')
+      .notNull()
+      .references(() => agents.id, { onDelete: 'cascade' }),
+    tagId: integer('tag_id')
+      .notNull()
+      .references(() => tags.id, { onDelete: 'cascade' }),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.agentId, t.tagId] }),
+  }),
+);
+
+export const market = pgTable('market', {
+  id: serial('id').primaryKey(),
+
+  agentId: text('agent_id').references(() => agents.id, { onDelete: 'cascade' }),
+  pluginId: integer('plugin_id').references(() => plugins.id, { onDelete: 'cascade' }),
+
+  type: text('type', { enum: ['plugin', 'model', 'agent', 'group'] }).notNull(),
+
+  view: integer('view').default(0),
+  like: integer('like').default(0),
+  used: integer('used').default(0),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});

src/database/server/schemas/lobechat/file.ts

@@ -0,0 +1,28 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { integer, jsonb, pgTable, text, varchar } from 'drizzle-orm/pg-core';
+
+import { idGenerator } from '../../utils/idGenerator';
+import { createdAt, updatedAt } from './_helpers';
+import { users } from './user';
+
+export const files = pgTable('files', {
+  id: text('id')
+    .$defaultFn(() => idGenerator('files'))
+    .primaryKey(),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+  fileType: varchar('file_type', { length: 255 }).notNull(),
+  name: text('name').notNull(),
+  size: integer('size').notNull(),
+  url: text('url').notNull(),
+
+  metadata: jsonb('metadata'),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewFile = typeof files.$inferInsert;
+export type FileItem = typeof files.$inferSelect;

src/database/server/schemas/lobechat/index.ts

@@ -0,0 +1,6 @@
+export * from './chat';
+export * from './discover';
+export * from './file';
+export * from './nextauth';
+export * from './relations';
+export * from './user';

src/database/server/schemas/lobechat/nextauth.ts

@@ -1,8 +1,7 @@
-//  ======= nextauth ======= //
 import { boolean, integer, pgTable, primaryKey, text, timestamp } from 'drizzle-orm/pg-core';
 import { AdapterAccount } from 'next-auth/adapters';
 
-import { users } from '@/database/server/schemas/lobechat';
+import { users } from './user';
 
 /**
  * This table stores nextauth accounts. This is used to link users to their sso profiles.

src/database/server/schemas/lobechat/relations.ts

@@ -0,0 +1,138 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { relations } from 'drizzle-orm';
+
+import {
+  agents,
+  agentsToSessions,
+  filesToAgents,
+  filesToMessages,
+  filesToSessions,
+  messages,
+  sessionGroups,
+  sessions,
+  topics,
+} from './chat';
+import { agentsTags, plugins, pluginsTags, tags } from './discover';
+import { files } from './file';
+
+export const filesRelations = relations(files, ({ many }) => ({
+  filesToMessages: many(filesToMessages),
+  filesToSessions: many(filesToSessions),
+  filesToAgents: many(filesToAgents),
+}));
+
+export const topicRelations = relations(topics, ({ one }) => ({
+  session: one(sessions, {
+    fields: [topics.sessionId],
+    references: [sessions.id],
+  }),
+}));
+
+export const pluginsRelations = relations(plugins, ({ many }) => ({
+  pluginsTags: many(pluginsTags),
+}));
+
+export const pluginsTagsRelations = relations(pluginsTags, ({ one }) => ({
+  plugin: one(plugins, {
+    fields: [pluginsTags.pluginId],
+    references: [plugins.id],
+  }),
+  tag: one(tags, {
+    fields: [pluginsTags.tagId],
+    references: [tags.id],
+  }),
+}));
+
+export const tagsRelations = relations(tags, ({ many }) => ({
+  agentsTags: many(agentsTags),
+  pluginsTags: many(pluginsTags),
+}));
+
+export const messagesRelations = relations(messages, ({ many, one }) => ({
+  filesToMessages: many(filesToMessages),
+
+  session: one(sessions, {
+    fields: [messages.sessionId],
+    references: [sessions.id],
+  }),
+
+  parent: one(messages, {
+    fields: [messages.parentId],
+    references: [messages.id],
+  }),
+
+  topic: one(topics, {
+    fields: [messages.topicId],
+    references: [topics.id],
+  }),
+}));
+
+export const agentsRelations = relations(agents, ({ many }) => ({
+  agentsToSessions: many(agentsToSessions),
+  filesToAgents: many(filesToAgents),
+  agentsTags: many(agentsTags),
+}));
+
+export const agentsToSessionsRelations = relations(agentsToSessions, ({ one }) => ({
+  session: one(sessions, {
+    fields: [agentsToSessions.sessionId],
+    references: [sessions.id],
+  }),
+  agent: one(agents, {
+    fields: [agentsToSessions.agentId],
+    references: [agents.id],
+  }),
+}));
+
+export const filesToAgentsRelations = relations(filesToAgents, ({ one }) => ({
+  agent: one(agents, {
+    fields: [filesToAgents.agentId],
+    references: [agents.id],
+  }),
+  file: one(files, {
+    fields: [filesToAgents.fileId],
+    references: [files.id],
+  }),
+}));
+
+export const filesToMessagesRelations = relations(filesToMessages, ({ one }) => ({
+  file: one(files, {
+    fields: [filesToMessages.fileId],
+    references: [files.id],
+  }),
+  message: one(messages, {
+    fields: [filesToMessages.messageId],
+    references: [messages.id],
+  }),
+}));
+
+export const filesToSessionsRelations = relations(filesToSessions, ({ one }) => ({
+  file: one(files, {
+    fields: [filesToSessions.fileId],
+    references: [files.id],
+  }),
+  session: one(sessions, {
+    fields: [filesToSessions.sessionId],
+    references: [sessions.id],
+  }),
+}));
+
+export const agentsTagsRelations = relations(agentsTags, ({ one }) => ({
+  agent: one(agents, {
+    fields: [agentsTags.agentId],
+    references: [agents.id],
+  }),
+  tag: one(tags, {
+    fields: [agentsTags.tagId],
+    references: [tags.id],
+  }),
+}));
+
+export const sessionsRelations = relations(sessions, ({ many, one }) => ({
+  filesToSessions: many(filesToSessions),
+  agentsToSessions: many(agentsToSessions),
+  group: one(sessionGroups, {
+    fields: [sessions.groupId],
+    references: [sessionGroups.id],
+  }),
+}));

src/database/server/schemas/lobechat/user.ts

@@ -0,0 +1,111 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import {
+  boolean,
+  integer,
+  jsonb,
+  pgTable,
+  text,
+} from 'drizzle-orm/pg-core';
+
+import { DEFAULT_PREFERENCE } from '@/const/user';
+
+import { createdAt, timestamptz, updatedAt } from './_helpers';
+
+/**
+ * This table stores users. Users are created in Clerk, then Clerk calls a
+ * webhook at /api/webhook/clerk to inform this application a user was created.
+ */
+export const users = pgTable('users', {
+  // The ID will be the user's ID from Clerk
+  id: text('id').primaryKey().notNull(),
+  username: text('username').unique(),
+  email: text('email'),
+
+  avatar: text('avatar'),
+  phone: text('phone'),
+  firstName: text('first_name'),
+  lastName: text('last_name'),
+  fullName: text('full_name'),
+
+  isOnboarded: boolean('is_onboarded').default(false),
+  // Time user was created in Clerk
+  clerkCreatedAt: timestamptz('clerk_created_at'),
+
+  // Required by nextauth, all null allowed
+  emailVerifiedAt: timestamptz('email_verified_at'),
+
+  preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUser = typeof users.$inferInsert;
+export type UserItem = typeof users.$inferSelect;
+
+export const userSubscriptions = pgTable('user_subscriptions', {
+  id: text('id').primaryKey().notNull(),
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+  stripeId: text('stripe_id'),
+
+  currency: text('currency'),
+  pricing: integer('pricing'),
+  billingPaidAt: integer('billing_paid_at'),
+  billingCycleStart: integer('billing_cycle_start'),
+  billingCycleEnd: integer('billing_cycle_end'),
+
+  cancelAtPeriodEnd: boolean('cancel_at_period_end'),
+  cancelAt: integer('cancel_at'),
+
+  nextBilling: jsonb('next_billing'),
+
+  plan: text('plan'),
+  recurring: text('recurring'),
+
+  storageLimit: integer('storage_limit'),
+
+  status: integer('status'),
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUserSubscription = typeof userSubscriptions.$inferInsert;
+export type UserSubscriptionItem = typeof userSubscriptions.$inferSelect;
+
+export const userBudgets = pgTable('user_budgets', {
+  id: text('id')
+    .primaryKey()
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  freeBudgetId: text('free_budget_id'),
+  freeBudgetKey: text('free_budget_key'),
+
+  subscriptionBudgetId: text('subscription_budget_id'),
+  subscriptionBudgetKey: text('subscription_budget_key'),
+
+  packageBudgetId: text('package_budget_id'),
+  packageBudgetKey: text('package_budget_key'),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUserBudgets = typeof userBudgets.$inferInsert;
+export type UserBudgetItem = typeof userBudgets.$inferSelect;
+
+export const userSettings = pgTable('user_settings', {
+  id: text('id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .primaryKey(),
+
+  tts: jsonb('tts'),
+  keyVaults: text('key_vaults'),
+  general: jsonb('general'),
+  languageModel: jsonb('language_model'),
+  systemAgent: jsonb('system_agent'),
+  defaultAgent: jsonb('default_agent'),
+  tool: jsonb('tool'),
+});