xMerge branch 'canary' into feature/delete-docker-volumes

packages/server/src/db/schema/auth.ts

@@ -92,6 +92,7 @@ export const apiUpdateAuth = createSchema.partial().extend({
 	email: z.string().nullable(),
 	password: z.string().nullable(),
 	image: z.string().optional(),
+	currentPassword: z.string().nullable(),
 });
 
 export const apiUpdateAuthByAdmin = createSchema.partial().extend({

packages/server/src/db/schema/server.ts

@@ -40,7 +40,7 @@ export const server = pgTable("server", {
 		.notNull()
 		.references(() => admins.adminId, { onDelete: "cascade" }),
 	serverStatus: serverStatus("serverStatus").notNull().default("active"),
-
+	command: text("command").notNull().default(""),
 	sshKeyId: text("sshKeyId").references(() => sshKeys.sshKeyId, {
 		onDelete: "set null",
 	}),
@@ -105,4 +105,7 @@ export const apiUpdateServer = createSchema
 		username: true,
 		sshKeyId: true,
 	})
-	.required();
+	.required()
+	.extend({
+		command: z.string().optional(),
+	});