@h-ai/cli 0.1.0-alpha.18 → 0.1.0-alpha.20

package/templates/base/package.json.hbs

@@ -1,6 +1,6 @@
 {
   "name": "{{projectName}}",
-  "version": "0.1.0-alpha.18",
+  "version": "0.1.0-alpha.20",
   "private": true,
   "description": "{{#if_eq appType 'admin'}}Enterprise management system built with hai Agent Framework{{/if_eq}}{{#if_eq appType 'website'}}Enterprise website built with hai Agent Framework{{/if_eq}}{{#if_eq appType 'h5'}}Mobile H5 app built with hai Agent Framework{{/if_eq}}{{#if_eq appType 'api'}}REST API service built with hai Agent Framework{{/if_eq}}{{#if_eq appType 'android-app'}}Android app built with hai Agent Framework{{/if_eq}}",
   "keywords": ["hai", "sveltekit", "svelte5", "{{appType}}"],
@@ -22,36 +22,42 @@
     "clean": "rimraf .svelte-kit build .turbo"
   },
   "dependencies": {
-    "@h-ai/core": "^0.1.0-alpha.18",
-    "@h-ai/kit": "^0.1.0-alpha.18"{{#if hasUi}},
-    "@h-ai/ui": "^0.1.0-alpha.18"{{/if}}{{#if features.db}},
-    "@h-ai/reldb": "^0.1.0-alpha.18"{{/if}}{{#if features.cache}},
-    "@h-ai/cache": "^0.1.0-alpha.18"{{/if}}{{#if features.iam}},
-    "@h-ai/iam": "^0.1.0-alpha.18"{{/if}}{{#if features.crypto}},
-    "@h-ai/crypto": "^0.1.0-alpha.18"{{/if}}{{#if features.storage}},
-    "@h-ai/storage": "^0.1.0-alpha.18"{{/if}}{{#if features.ai}},
-    "@h-ai/ai": "^0.1.0-alpha.18"{{/if}}{{#if features.audit}},
-    "@h-ai/audit": "^0.1.0-alpha.18"{{/if}}{{#if features.reach}},
-    "@h-ai/reach": "^0.1.0-alpha.18"{{/if}}{{#if features.payment}},
-    "@h-ai/payment": "^0.1.0-alpha.18"{{/if}}{{#if features.vecdb}},
-    "@h-ai/vecdb": "^0.1.0-alpha.18"{{/if}}{{#if features.datapipe}},
-    "@h-ai/datapipe": "^0.1.0-alpha.18"{{/if}}{{#if features.scheduler}},
-    "@h-ai/scheduler": "^0.1.0-alpha.18"{{/if}}{{#if features.deploy}},
-    "@h-ai/deploy": "^0.1.0-alpha.18"{{/if}}{{#if features.api-client}},
-    "@h-ai/api-client": "^0.1.0-alpha.18"{{/if}}{{#if features.capacitor}},
-    "@h-ai/capacitor": "^0.1.0-alpha.18"{{/if}}{{#if isCapacitorApp}}{{#unless features.api-client}},
-    "@h-ai/api-client": "^0.1.0-alpha.18"{{/unless}}{{#unless features.capacitor}},
-    "@h-ai/capacitor": "^0.1.0-alpha.18"{{/unless}}{{/if}},
+    "@h-ai/core": "^0.1.0-alpha.20",
+    "@h-ai/kit": "^0.1.0-alpha.20"{{#if hasUi}},
+    "@h-ai/ui": "^0.1.0-alpha.20"{{/if}}{{#if features.db}},
+    "@h-ai/reldb": "^0.1.0-alpha.20"{{/if}}{{#if features.cache}},
+    "@h-ai/cache": "^0.1.0-alpha.20"{{/if}}{{#if features.iam}},
+    "@h-ai/iam": "^0.1.0-alpha.20"{{/if}}{{#if features.crypto}},
+    "@h-ai/crypto": "^0.1.0-alpha.20"{{/if}}{{#if features.storage}},
+    "@h-ai/storage": "^0.1.0-alpha.20"{{/if}}{{#if features.ai}},
+    "@h-ai/ai": "^0.1.0-alpha.20"{{/if}}{{#if features.audit}},
+    "@h-ai/audit": "^0.1.0-alpha.20"{{/if}}{{#if features.reach}},
+    "@h-ai/reach": "^0.1.0-alpha.20"{{/if}}{{#if features.payment}},
+    "@h-ai/payment": "^0.1.0-alpha.20"{{/if}}{{#if features.vecdb}},
+    "@h-ai/vecdb": "^0.1.0-alpha.20"{{/if}}{{#if features.datapipe}},
+    "@h-ai/datapipe": "^0.1.0-alpha.20"{{/if}}{{#if features.scheduler}},
+    "@h-ai/scheduler": "^0.1.0-alpha.20"{{/if}}{{#if features.deploy}},
+    "@h-ai/deploy": "^0.1.0-alpha.20"{{/if}}{{#if features.api-client}},
+    "@h-ai/api-client": "^0.1.0-alpha.20"{{/if}}{{#if features.capacitor}},
+    "@h-ai/capacitor": "^0.1.0-alpha.20"{{/if}}{{#if isCapacitorApp}}{{#unless features.api-client}},
+    "@h-ai/api-client": "^0.1.0-alpha.20"{{/unless}}{{#unless features.capacitor}},
+    "@h-ai/capacitor": "^0.1.0-alpha.20"{{/unless}}{{/if}},
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
     "@playwright/test": "^1.60.0",
 {{#if isCapacitorApp}}
-    "@capacitor/cli": "^8.2.0",
-    "@capacitor/core": "^8.2.0",
-    "@capacitor/android": "^8.2.0",
+  "@aparajita/capacitor-secure-storage": "^8.0.0",
+    "@capacitor/app": "^8.0.1",
+    "@capacitor/camera": "^8.0.2",
+    "@capacitor/cli": "^8.3.4",
+    "@capacitor/core": "^8.3.4",
+    "@capacitor/android": "^8.3.4",
+    "@capacitor/device": "^8.0.1",
     "@capacitor/preferences": "^8.0.1",
+    "@capacitor/push-notifications": "^8.0.2",
+    "@capacitor/status-bar": "^8.0.1",
     "@sveltejs/adapter-static": "^3.0.10",
 {{else}}
 {{#if_eq appType 'api'}}

package/templates/base/src/app.html.hbs

@@ -1,6 +1,10 @@
 <!doctype html>
 {{#if hasI18n}}
+{{#if isCapacitorApp}}
+<html lang="{{defaultLocale}}">
+{{else}}
 <html lang="%lang%">
+{{/if}}
 {{else}}
 <html lang="{{defaultLocale}}">
 {{/if}}

package/templates/base/src/hooks.server.ts.hbs

@@ -5,18 +5,18 @@
  */
 
 import type { Handle } from '@sveltejs/kit'
+{{#if hasI18n}}
+import { paraglideMiddleware } from '$lib/paraglide/server.js'
+{{/if}}
 import { initApp } from '$lib/server/init.js'
 import { core } from '@h-ai/core'
-import { kit } from '@h-ai/kit'
-{{#if features.iam}}
-import { iam } from '@h-ai/iam'
-{{/if}}
 {{#if features.crypto}}
 import { crypto } from '@h-ai/crypto'
 {{/if}}
-{{#if hasI18n}}
-import { paraglideMiddleware } from '$lib/paraglide/server.js'
+{{#if features.iam}}
+import { iam } from '@h-ai/iam'
 {{/if}}
+import { kit } from '@h-ai/kit'
 
 {{#if features.crypto}}
 // 初始化加密模块（同步）
@@ -85,7 +85,17 @@ const haiHandle = kit.createHandle({
   auth: {
     verifyToken: async (token) => {
       const result = await iam.auth.verifyToken(token)
-      return result.success ? result.data : null
+      if (!result.success)
+        return null
+      const session = result.data
+      // 映射为 kit 的 SessionData 形态（携带守卫所需的核心字段）
+      return {
+        userId: session.userId,
+        username: session.username,
+        roles: session.roles,
+        permissions: session.permissions,
+        data: session.data,
+      }
     },
     operations: iam.auth,
     loginUrl: '/auth/login',

package/templates/base/src/lib/server/init.ts.hbs

@@ -27,31 +27,39 @@
 {{/if}}
  */
 
-{{#if features.cache}}
-import { cache, CacheConfigSchema } from '@h-ai/cache'
-{{/if}}
-import { core } from '@h-ai/core'
-{{#if features.db}}
-import { reldb, ReldbConfigSchema } from '@h-ai/reldb'
+{{#if features.ai}}
+import type { AIConfigInput } from '@h-ai/ai'
 {{/if}}
 {{#if features.iam}}
 import type { IamConfigSettingsInput } from '@h-ai/iam'
-import { iam } from '@h-ai/iam'
+{{/if}}
+{{#if features.reach}}
+import type { ReachConfigInput } from '@h-ai/reach'
 {{/if}}
 {{#if features.storage}}
 import type { StorageConfigInput } from '@h-ai/storage'
-import { storage, StorageConfigSchema } from '@h-ai/storage'
 {{/if}}
 {{#if features.ai}}
-import type { AIConfigInput } from '@h-ai/ai'
 import { ai } from '@h-ai/ai'
 {{/if}}
+{{#if features.audit}}
+import { audit } from '@h-ai/audit'
+{{/if}}
+{{#if features.cache}}
+import { cache, CacheConfigSchema } from '@h-ai/cache'
+{{/if}}
+import { core } from '@h-ai/core'
+{{#if features.iam}}
+import { iam } from '@h-ai/iam'
+{{/if}}
 {{#if features.reach}}
-import type { ReachConfigInput } from '@h-ai/reach'
 import { reach } from '@h-ai/reach'
 {{/if}}
-{{#if features.audit}}
-import { audit } from '@h-ai/audit'
+{{#if features.db}}
+import { reldb, ReldbConfigSchema } from '@h-ai/reldb'
+{{/if}}
+{{#if features.storage}}
+import { storage, StorageConfigSchema } from '@h-ai/storage'
 {{/if}}
 
 {{#if features.db}}

package/templates/base/tests/scaffold.test.ts.hbs

@@ -22,6 +22,14 @@ describe('generated scaffold', () => {
 
   it('renders the app shell locale marker', async () => {
     const appHtml = await readFile(join(rootDir, 'src/app.html'), 'utf-8')
-    expect(appHtml).toContain('lang="{{#if hasI18n}}%lang%{{else}}{{defaultLocale}}{{/if}}"')
+    expect(appHtml).toContain('lang="{{#if hasI18n}}{{#if isCapacitorApp}}{{defaultLocale}}{{else}}%lang%{{/if}}{{else}}{{defaultLocale}}{{/if}}"')
   })
+{{#unless isCapacitorApp}}
+
+  it('ships an application config loaded at startup', async () => {
+    const coreConfig = await readFile(join(rootDir, 'config/_core.yml'), 'utf-8')
+    expect(coreConfig).toContain('name: {{projectName}}')
+    expect(coreConfig).toContain('defaultLocale: {{defaultLocale}}')
+  })
+{{/unless}}
 })

package/templates/base/vite.config.ts.hbs

@@ -3,13 +3,13 @@
  */
 import path from 'node:path'
 import process from 'node:process'
+{{#if hasI18n}}
+import { paraglideVitePlugin } from '@inlang/paraglide-js'
+{{/if}}
 import { sveltekit } from '@sveltejs/kit/vite'
 {{#if hasUi}}
 import tailwindcss from '@tailwindcss/vite'
 {{/if}}
-{{#if hasI18n}}
-import { paraglideVitePlugin } from '@inlang/paraglide-js'
-{{/if}}
 import { defineConfig, loadEnv } from 'vite'
 
 export default defineConfig(({ mode }) => {

package/templates/features/iam/routes-admin/(auth)/+layout.svelte.hbs

@@ -1,5 +1,5 @@
 {{!-- 认证布局（登录/注册共用） --}}
-<script lang="ts">
+<script lang='ts'>
   /**
    * 认证布局（登录/注册共用）
    */
@@ -9,12 +9,12 @@
     children: Snippet
   }
 
-  let { children }: Props = $props()
+  const { children }: Props = $props()
 </script>
 
-<div class="min-h-screen flex items-center justify-center bg-base-200">
-  <div class="card w-full max-w-md bg-base-100 shadow-xl">
-    <div class="card-body">
+<div class='min-h-screen flex items-center justify-center bg-base-200'>
+  <div class='card w-full max-w-md bg-base-100 shadow-xl'>
+    <div class='card-body'>
       {@render children()}
     </div>
   </div>

package/templates/features/iam/routes-admin/(auth)/auth/login/+page.svelte.hbs

@@ -1,18 +1,21 @@
 {{!-- Admin 登录页面 --}}
-<script lang="ts">
+<script lang='ts'>
   /**
    * 登录页面
    */
+  import { resolve } from '$app/paths'
 {{#if hasI18n}}
   import * as m from '$lib/paraglide/messages'
 {{/if}}
+  import { Alert, Button, FormField, Input } from '@h-ai/ui'
 
   let username = $state('')
   let password = $state('')
   let error = $state('')
   let loading = $state(false)
 
-  async function handleLogin() {
+  async function handleLogin(event: SubmitEvent) {
+    event.preventDefault()
     error = ''
     loading = true
     try {
@@ -24,20 +27,23 @@
       const data = await res.json()
       if (data.success) {
         window.location.href = '/admin'
-      } else {
+      }
+      else {
 {{#if hasI18n}}
         error = data.error?.message || m.auth_login_failed()
 {{else}}
         error = data.error?.message || '登录失败'
 {{/if}}
       }
-    } catch {
+    }
+    catch {
 {{#if hasI18n}}
       error = m.auth_error_network()
 {{else}}
       error = '网络错误'
 {{/if}}
-    } finally {
+    }
+    finally {
       loading = false
     }
   }
@@ -52,47 +58,43 @@
 </svelte:head>
 
 {{#if hasI18n}}
-<h2 class="card-title justify-center mb-4">{m.auth_login_title()}</h2>
+<h2 class='text-2xl font-bold text-center mb-6'>{m.auth_login_title()}</h2>
 {{else}}
-<h2 class="card-title justify-center mb-4">登录</h2>
+<h2 class='text-2xl font-bold text-center mb-6'>登录</h2>
 {{/if}}
 
 {#if error}
-  <div class="alert alert-error mb-4">
-    <span>{error}</span>
-  </div>
+  <Alert variant='error' class='mb-4'>{error}</Alert>
 {/if}
 
-<form onsubmit={(e) => { e.preventDefault(); handleLogin() }} class="space-y-4">
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="username"><span class="label-text">{m.auth_label_username()}</span></label>
-{{else}}
-    <label class="label" for="username"><span class="label-text">用户名</span></label>
-{{/if}}
-    <input id="username" type="text" class="input input-bordered w-full" bind:value={username} required />
-  </div>
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="password"><span class="label-text">{m.auth_label_password()}</span></label>
-{{else}}
-    <label class="label" for="password"><span class="label-text">密码</span></label>
-{{/if}}
-    <input id="password" type="password" class="input input-bordered w-full" bind:value={password} required />
-  </div>
-  <button type="submit" class="btn btn-primary w-full" disabled={loading}>
+<form onsubmit={handleLogin} class='space-y-4'>
 {{#if hasI18n}}
+  <FormField label={m.auth_label_username()} required>
+    <Input id='username' type='text' bind:value={username} required />
+  </FormField>
+  <FormField label={m.auth_label_password()} required>
+    <Input id='password' type='password' bind:value={password} required />
+  </FormField>
+  <Button type='submit' variant='primary' loading={loading} class='w-full'>
     {loading ? m.auth_login_loading() : m.auth_login_submit()}
+  </Button>
 {{else}}
+  <FormField label='用户名' required>
+    <Input id='username' type='text' bind:value={username} required />
+  </FormField>
+  <FormField label='密码' required>
+    <Input id='password' type='password' bind:value={password} required />
+  </FormField>
+  <Button type='submit' variant='primary' loading={loading} class='w-full'>
     {loading ? '登录中...' : '登录'}
+  </Button>
 {{/if}}
-  </button>
 </form>
 
-<div class="text-center mt-4">
+<div class='text-center mt-4'>
 {{#if hasI18n}}
-  <a href="/auth/register" class="link link-primary text-sm">{m.auth_login_to_register()}</a>
+  <a href={resolve('/auth/register', {})} class='link link-primary text-sm'>{m.auth_login_to_register()}</a>
 {{else}}
-  <a href="/auth/register" class="link link-primary text-sm">没有账号？立即注册</a>
+  <a href={resolve('/auth/register', {})} class='link link-primary text-sm'>没有账号？立即注册</a>
 {{/if}}
 </div>

package/templates/features/iam/routes-admin/(auth)/auth/register/+page.svelte.hbs

@@ -1,11 +1,13 @@
 {{!-- Admin 注册页面 --}}
-<script lang="ts">
+<script lang='ts'>
   /**
    * 注册页面
    */
+  import { resolve } from '$app/paths'
 {{#if hasI18n}}
   import * as m from '$lib/paraglide/messages'
 {{/if}}
+  import { Alert, Button, FormField, Input } from '@h-ai/ui'
 
   let username = $state('')
   let email = $state('')
@@ -14,7 +16,8 @@
   let error = $state('')
   let loading = $state(false)
 
-  async function handleRegister() {
+  async function handleRegister(event: SubmitEvent) {
+    event.preventDefault()
     error = ''
     if (password !== confirmPassword) {
 {{#if hasI18n}}
@@ -34,20 +37,23 @@
       const data = await res.json()
       if (data.success) {
         window.location.href = '/auth/login'
-      } else {
+      }
+      else {
 {{#if hasI18n}}
         error = data.error?.message || m.auth_register_failed()
 {{else}}
         error = data.error?.message || '注册失败'
 {{/if}}
       }
-    } catch {
+    }
+    catch {
 {{#if hasI18n}}
       error = m.auth_error_network()
 {{else}}
       error = '网络错误'
 {{/if}}
-    } finally {
+    }
+    finally {
       loading = false
     }
   }
@@ -62,63 +68,55 @@
 </svelte:head>
 
 {{#if hasI18n}}
-<h2 class="card-title justify-center mb-4">{m.auth_register_title()}</h2>
+<h2 class='text-2xl font-bold text-center mb-6'>{m.auth_register_title()}</h2>
 {{else}}
-<h2 class="card-title justify-center mb-4">注册</h2>
+<h2 class='text-2xl font-bold text-center mb-6'>注册</h2>
 {{/if}}
 
 {#if error}
-  <div class="alert alert-error mb-4">
-    <span>{error}</span>
-  </div>
+  <Alert variant='error' class='mb-4'>{error}</Alert>
 {/if}
 
-<form onsubmit={(e) => { e.preventDefault(); handleRegister() }} class="space-y-4">
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="username"><span class="label-text">{m.auth_label_username()}</span></label>
-{{else}}
-    <label class="label" for="username"><span class="label-text">用户名</span></label>
-{{/if}}
-    <input id="username" type="text" class="input input-bordered w-full" bind:value={username} required />
-  </div>
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="email"><span class="label-text">{m.auth_label_email()}</span></label>
-{{else}}
-    <label class="label" for="email"><span class="label-text">邮箱</span></label>
-{{/if}}
-    <input id="email" type="email" class="input input-bordered w-full" bind:value={email} required />
-  </div>
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="password"><span class="label-text">{m.auth_label_password()}</span></label>
-{{else}}
-    <label class="label" for="password"><span class="label-text">密码</span></label>
-{{/if}}
-    <input id="password" type="password" class="input input-bordered w-full" bind:value={password} required />
-  </div>
-  <div class="form-control">
-{{#if hasI18n}}
-    <label class="label" for="confirmPassword"><span class="label-text">{m.auth_label_confirm_password()}</span></label>
-{{else}}
-    <label class="label" for="confirmPassword"><span class="label-text">确认密码</span></label>
-{{/if}}
-    <input id="confirmPassword" type="password" class="input input-bordered w-full" bind:value={confirmPassword} required />
-  </div>
-  <button type="submit" class="btn btn-primary w-full" disabled={loading}>
+<form onsubmit={handleRegister} class='space-y-4'>
 {{#if hasI18n}}
+  <FormField label={m.auth_label_username()} required>
+    <Input id='username' type='text' bind:value={username} required />
+  </FormField>
+  <FormField label={m.auth_label_email()} required>
+    <Input id='email' type='email' bind:value={email} required />
+  </FormField>
+  <FormField label={m.auth_label_password()} required>
+    <Input id='password' type='password' bind:value={password} required />
+  </FormField>
+  <FormField label={m.auth_label_confirm_password()} required>
+    <Input id='confirmPassword' type='password' bind:value={confirmPassword} required />
+  </FormField>
+  <Button type='submit' variant='primary' loading={loading} class='w-full'>
     {loading ? m.auth_register_loading() : m.auth_register_submit()}
+  </Button>
 {{else}}
+  <FormField label='用户名' required>
+    <Input id='username' type='text' bind:value={username} required />
+  </FormField>
+  <FormField label='邮箱' required>
+    <Input id='email' type='email' bind:value={email} required />
+  </FormField>
+  <FormField label='密码' required>
+    <Input id='password' type='password' bind:value={password} required />
+  </FormField>
+  <FormField label='确认密码' required>
+    <Input id='confirmPassword' type='password' bind:value={confirmPassword} required />
+  </FormField>
+  <Button type='submit' variant='primary' loading={loading} class='w-full'>
     {loading ? '注册中...' : '注册'}
+  </Button>
 {{/if}}
-  </button>
 </form>
 
-<div class="text-center mt-4">
+<div class='text-center mt-4'>
 {{#if hasI18n}}
-  <a href="/auth/login" class="link link-primary text-sm">{m.auth_register_to_login()}</a>
+  <a href={resolve('/auth/login', {})} class='link link-primary text-sm'>{m.auth_register_to_login()}</a>
 {{else}}
-  <a href="/auth/login" class="link link-primary text-sm">已有账号？立即登录</a>
+  <a href={resolve('/auth/login', {})} class='link link-primary text-sm'>已有账号？立即登录</a>
 {{/if}}
 </div>

package/templates/features/iam/routes-h5/auth/login/+page.svelte.hbs

@@ -1,18 +1,21 @@
 {{!-- H5 登录页面 --}}
-<script lang="ts">
+<script lang='ts'>
   /**
    * H5 登录页面
    */
+  import { resolve } from '$app/paths'
 {{#if hasI18n}}
   import * as m from '$lib/paraglide/messages'
 {{/if}}
+  import { Alert, Button, FormField, Input } from '@h-ai/ui'
 
   let username = $state('')
   let password = $state('')
   let error = $state('')
   let loading = $state(false)
 
-  async function handleLogin() {
+  async function handleLogin(event: SubmitEvent) {
+    event.preventDefault()
     error = ''
     loading = true
     try {
@@ -24,20 +27,23 @@
       const data = await res.json()
       if (data.success) {
         window.location.href = '/'
-      } else {
+      }
+      else {
 {{#if hasI18n}}
         error = data.error?.message || m.auth_login_failed()
 {{else}}
         error = data.error?.message || '登录失败'
 {{/if}}
       }
-    } catch {
+    }
+    catch {
 {{#if hasI18n}}
       error = m.auth_error_network()
 {{else}}
       error = '网络错误'
 {{/if}}
-    } finally {
+    }
+    finally {
       loading = false
     }
   }
@@ -51,48 +57,46 @@
 {{/if}}
 </svelte:head>
 
-<div class="p-4 pt-12">
+<div class='p-4 pt-12 space-y-4'>
 {{#if hasI18n}}
-  <h1 class="text-2xl font-bold text-center mb-8">{m.auth_login_title()}</h1>
+  <h1 class='text-2xl font-black tracking-tight text-center'>{m.auth_login_title()}</h1>
 {{else}}
-  <h1 class="text-2xl font-bold text-center mb-8">登录</h1>
+  <h1 class='text-2xl font-black tracking-tight text-center'>登录</h1>
 {{/if}}
 
   {#if error}
-    <div class="alert alert-error mb-4">
-      <span>{error}</span>
-    </div>
+    <Alert variant='error'>{error}</Alert>
   {/if}
 
-  <form onsubmit={(e) => { e.preventDefault(); handleLogin() }} class="space-y-4">
-    <div class="form-control">
-{{#if hasI18n}}
-      <input type="text" placeholder={m.auth_label_username()} class="input input-bordered w-full" bind:value={username} required />
-{{else}}
-      <input type="text" placeholder="用户名" class="input input-bordered w-full" bind:value={username} required />
-{{/if}}
-    </div>
-    <div class="form-control">
-{{#if hasI18n}}
-      <input type="password" placeholder={m.auth_label_password()} class="input input-bordered w-full" bind:value={password} required />
-{{else}}
-      <input type="password" placeholder="密码" class="input input-bordered w-full" bind:value={password} required />
-{{/if}}
-    </div>
-    <button type="submit" class="btn btn-primary w-full" disabled={loading}>
+  <form onsubmit={handleLogin} class='space-y-4'>
 {{#if hasI18n}}
+    <FormField label={m.auth_label_username()} required>
+      <Input id='username' type='text' bind:value={username} required />
+    </FormField>
+    <FormField label={m.auth_label_password()} required>
+      <Input id='password' type='password' bind:value={password} required />
+    </FormField>
+    <Button type='submit' variant='primary' loading={loading} class='w-full'>
       {loading ? m.auth_login_loading() : m.auth_login_submit()}
+    </Button>
 {{else}}
+    <FormField label='用户名' required>
+      <Input id='username' type='text' bind:value={username} required />
+    </FormField>
+    <FormField label='密码' required>
+      <Input id='password' type='password' bind:value={password} required />
+    </FormField>
+    <Button type='submit' variant='primary' loading={loading} class='w-full'>
       {loading ? '登录中...' : '登录'}
+    </Button>
 {{/if}}
-    </button>
   </form>
 
-  <div class="text-center mt-6">
+  <div class='text-center'>
 {{#if hasI18n}}
-    <a href="/auth/register" class="link link-primary text-sm">{m.auth_login_to_register()}</a>
+    <a href={resolve('/auth/register', {})} class='link link-primary text-sm'>{m.auth_login_to_register()}</a>
 {{else}}
-    <a href="/auth/register" class="link link-primary text-sm">没有账号？立即注册</a>
+    <a href={resolve('/auth/register', {})} class='link link-primary text-sm'>没有账号？立即注册</a>
 {{/if}}
   </div>
 </div>