@coze-arch/cli 0.0.1-alpha.6a5120 → 0.0.1-alpha.6f4390

package/lib/__templates__/expo/.coze

@@ -3,5 +3,10 @@ entrypoint = "server.js"
 requires = ["nodejs-24"]
 
 [dev]
-build = ["bash", ".cozeproj/scripts/deploy_build.sh"]
-run = ["bash", ".cozeproj/scripts/deploy_run.sh"]
+build = ["bash", ".cozeproj/scripts/dev_build.sh"]
+run = ["bash", ".cozeproj/scripts/dev_run.sh"]
+
+[deploy]
+build = ["bash", ".cozeproj/scripts/prod_build.sh"]
+run = ["bash", ".cozeproj/scripts/prod_run.sh"]
+build_app_dir = "."

package/lib/__templates__/expo/.cozeproj/scripts/{deploy_build.sh → dev_build.sh}

@@ -49,13 +49,6 @@ fs.writeSync(fd, record+"\n", null, "utf8");
 fs.fsyncSync(fd);
 fs.closeSync(fd);
 ' "$LOG_FILE" "$level" "$msg"
-
-  case "$level" in
-    INFO) info "$msg" ;;
-    WARN) warn "$msg" ;;
-    ERROR) echo -e "\033[31m[ERROR] $msg\033[0m" ;;
-    *) info "$msg" ;;
-  esac
 }
 
 # ==================== 前置检查 ====================

package/lib/__templates__/expo/.cozeproj/scripts/{deploy_run.sh → dev_run.sh}

@@ -1,4 +1,5 @@
 ROOT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PREVIEW_DIR="${COZE_PREVIEW_DIR:-$ROOT_DIR}"
 LOG_DIR="${COZE_LOG_DIR:-$ROOT_DIR/logs}"
 LOG_FILE="$LOG_DIR/app.log"
 mkdir -p "$LOG_DIR"
@@ -10,7 +11,7 @@ SERVER_PORT="9091"
 # Expo 项目配置
 EXPO_HOST="0.0.0.0"
 EXPO_DIR="expo"
-EXPO_PORT="9090"
+EXPO_PORT="5000"
 WEB_URL="${COZE_PROJECT_DOMAIN_DEFAULT:-http://127.0.0.1:${SERVER_PORT}}"
 ASSUME_YES="1"
 EXPO_PUBLIC_BACKEND_BASE_URL="${EXPO_PUBLIC_BACKEND_BASE_URL:-$WEB_URL}"
@@ -116,18 +117,12 @@ fs.writeSync(fd, record+"\n", null, "utf8");
 fs.fsyncSync(fd);
 fs.closeSync(fd);
 ' "$LOG_FILE" "$level" "$msg"
-  case "$level" in
-    INFO) echo -e "\033[32m[INFO] $msg\033[0m" ;;
-    WARN) echo -e "\033[33m[WARN] $msg\033[0m" ;;
-    ERROR) echo -e "\033[31m[ERROR] $msg\033[0m" ;;
-    *) echo -e "\033[32m[INFO] $msg\033[0m" ;;
-  esac
 }
 
 wait_port_connectable() {
   local host=$1 port=$2 retries=${3:-10}
   for _ in $(seq 1 "$retries"); do
-    nc -z "$host" "$port" && return 0
+    nc -z -w 1 "$host" "$port" >/dev/null 2>&1 && return 0
     sleep 1
   done
   return 1
@@ -159,6 +154,15 @@ detect_expo_fetch_failed() {
 }
 
 # ==================== 前置检查 ====================
+# 关掉nginx进程
+ps -ef | grep nginx | grep -v grep | awk '{print $2}' | xargs -r kill -9
+
+write_log "INFO" "检查根目录 pre_install.py"
+if [ -f "$PREVIEW_DIR/pre_install.py" ]; then
+  write_log "INFO" "执行：python $PREVIEW_DIR/pre_install.py"
+  python "$PREVIEW_DIR/pre_install.py" || write_log "ERROR" "pre_install.py 执行失败"
+fi
+
 write_log "INFO" "==================== 开始启动 ===================="
 write_log "INFO" "开始执行服务启动脚本（start_dev.sh）..."
 write_log "INFO" "正在检查依赖命令和目录是否存在..."
@@ -176,14 +180,6 @@ ensure_port SERVER_PORT "$SERVER_PORT"
 ensure_port EXPO_PORT "$EXPO_PORT"
 
 # ==================== 启动 Server 服务 ====================
-write_log "INFO" "检查 Nginx 端口 (5000)..."
-if is_port_free 5000; then
-  write_log "INFO" "端口 5000 未被占用，正在启动 Nginx..."
-  service nginx start
-else
-  write_log "INFO" "端口 5000 已被占用，跳过 Nginx 启动"
-fi
-
 write_log "INFO" "==================== 启动 server 服务 ===================="
 write_log "INFO" "正在执行：npm run server"
 PORT="$SERVER_PORT" nohup npm run server > logs/app.log 2>&1 &

package/lib/__templates__/expo/.cozeproj/scripts/prod_build.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+if [ -z "${BASH_VERSION:-}" ]; then exec /usr/bin/env bash "$0" "$@"; fi
+set -euo pipefail
+ROOT_DIR="$(pwd)"
+
+# ==================== 工具函数 ====================
+info() {
+  echo "[INFO] $1"
+}
+warn() {
+  echo "[WARN] $1"
+}
+error() {
+  echo "[ERROR] $1"
+  exit 1
+}
+check_command() {
+  if ! command -v "$1" &> /dev/null; then
+    error "命令 $1 未找到，请先安装"
+  fi
+}
+
+info "==================== 开始构建 ===================="
+info "开始执行构建脚本（build_prod.sh）..."
+info "正在检查依赖命令是否存在..."
+# 检查核心命令
+check_command "pnpm"
+check_command "npm"
+
+# ==================== 安装 Node 依赖 ====================
+info "==================== 安装 Node 依赖 ===================="
+info "开始安装 Node 依赖"
+if [ -f "$ROOT_DIR/package.json" ]; then
+  info "进入目录：$ROOT_DIR"
+  info "正在执行：pnpm install"
+  (cd "$ROOT_DIR" && pnpm install --registry=https://registry.npmmirror.com) || error "Node 依赖安装失败"
+else
+  warn "未找到 $ROOT_DIR/package.json 文件，请检查路径是否正确"
+fi
+info "==================== 依赖安装完成！====================\n"
+
+info "==================== dist打包 ===================="
+info "开始执行：pnpm run server:build"
+(cd "$ROOT_DIR" && pnpm run server:build) || error "dist打包失败"
+info "==================== dist打包完成！====================\n"
+
+info "下一步：执行 ./prod_run.sh 启动服务"

package/lib/__templates__/expo/.cozeproj/scripts/prod_run.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# 产物部署使用
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+
+HOST="${HOST:-0.0.0.0}"
+PORT="${PORT:-5000}"
+
+# ==================== 工具函数 ====================
+info() {
+  echo "[INFO] $1"
+}
+warn() {
+  echo "[WARN] $1"
+}
+error() {
+  echo "[ERROR] $1"
+  exit 1
+}
+check_command() {
+  if ! command -v "$1" &> /dev/null; then
+    error "命令 $1 未找到，请先安装"
+  fi
+}
+
+# ============== 启动服务 ======================
+# 检查核心命令
+check_command "pnpm"
+check_command "npm"
+
+info "开始执行：pnpm run server:prod"
+(cd "$ROOT_DIR" && PORT="$PORT" pnpm run server:prod) || error "服务启动失败"
+info "服务启动完成！\n"

package/lib/__templates__/expo/babel.config.js

@@ -3,6 +3,16 @@ module.exports = function (api) {
   return {
     presets: ["babel-preset-expo"],
     plugins: [
+      [
+        "module-resolver",
+        {
+          root: ["./"],
+          alias: {
+            "@": "./client",
+          },
+          extensions: [".ios.js", ".android.js", ".js", ".ts", ".tsx", ".json"],
+        },
+      ],
       "react-native-reanimated/plugin",
     ],
   };

package/lib/__templates__/expo/client/constants/theme.ts

@@ -6,25 +6,35 @@ const tintColorDark = "#0A84FF";
 export const Colors = {
   light: {
     text: "#11181C",
+    textPrimary: "#11181C",
+    textSecondary: "#687076",
+    textMuted: "#9BA1A6",
     buttonText: "#FFFFFF",
     tabIconDefault: "#687076",
     tabIconSelected: tintColorLight,
+    primary: tintColorLight,
     link: "#007AFF",
     backgroundRoot: "#FFFFFF", // Elevation 0
     backgroundDefault: "#F2F2F2", // Elevation 1
     backgroundSecondary: "#E6E6E6", // Elevation 2
     backgroundTertiary: "#D9D9D9", // Elevation 3
+    border: "#E6E6E6",
   },
   dark: {
     text: "#ECEDEE",
+    textPrimary: "#ECEDEE",
+    textSecondary: "#9BA1A6",
+    textMuted: "#6F767E",
     buttonText: "#FFFFFF",
     tabIconDefault: "#9BA1A6",
     tabIconSelected: tintColorDark,
+    primary: tintColorDark,
     link: "#0A84FF",
     backgroundRoot: "#1F2123", // Elevation 0
     backgroundDefault: "#2A2C2E", // Elevation 1
     backgroundSecondary: "#353739", // Elevation 2
     backgroundTertiary: "#404244", // Elevation 3
+    border: "#353739",
   },
 };
 

package/lib/__templates__/expo/client/hooks/useTheme.ts

@@ -4,7 +4,7 @@ import { useColorScheme } from "@/hooks/useColorScheme";
 export function useTheme() {
   const colorScheme = useColorScheme();
   const isDark = colorScheme === "dark";
-  const theme = Colors[colorScheme ?? "light"];
+  const theme = Colors[(colorScheme as "light" | "dark") ?? "light"];
 
   return {
     theme,

package/lib/__templates__/expo/metro.config.js

@@ -1,5 +1,5 @@
 const { getDefaultConfig } = require('expo/metro-config');
-// const { createProxyMiddleware } = require('http-proxy-middleware');
+const { createProxyMiddleware } = require('http-proxy-middleware');
 const connect = require('connect');
 
 const config = getDefaultConfig(__dirname);
@@ -28,9 +28,8 @@ config.resolver.blockList = [
   /.*\.git\/.*/, // 排除 Git 目录
 ];
 
-/*
 const apiProxy = createProxyMiddleware({
-  target: 'http://localhost:5000',
+  target: 'http://localhost:9091',
   logLevel: 'debug',
 });
 
@@ -39,7 +38,7 @@ config.server = {
     enhanceMiddleware: (metroMiddleware, metroServer) => {
     return connect()
       .use((req, res, next) => {
-        if (req.url && req.url.startsWith('/api')) {
+        if (req.url && req.url.startsWith('/api/v')) {
           console.log(`[Metro Proxy] Forwarding ${req.method} ${req.url}`);
           return apiProxy(req, res, next);
         }
@@ -48,6 +47,5 @@ config.server = {
       .use(metroMiddleware);
   },
 }
-*/
 
 module.exports = config;

package/lib/__templates__/expo/package.json

@@ -12,6 +12,8 @@
     "install-missing": "node ./client/scripts/install-missing-deps.js",
     "lint": "expo lint",
     "server": "NODE_ENV=development tsx ./src/index.ts",
+    "server:build": "pnpm exec esbuild src/index.ts --platform=node --packages=external --bundle --format=esm --outdir=src_dist",
+    "server:prod": "NODE_ENV=production PORT=${PORT:-5000} node src_dist/index.js",
     "start": "expo start --web",
     "test": "jest --watchAll"
   },
@@ -32,8 +34,10 @@
     "@react-navigation/native": "^7.0.14",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
+    "babel-plugin-module-resolver": "^5.0.2",
+    "babel-preset-expo": "^54.0.9",
     "connect": "^3.7.0",
-    "coze-coding-dev-sdk": "^0.5.2",
+    "coze-coding-dev-sdk": "^0.5.5",
     "dayjs": "^1.11.19",
     "drizzle-kit": "^0.31.8",
     "drizzle-orm": "^0.45.1",
@@ -58,6 +62,7 @@
     "expo-system-ui": "~6.0.9",
     "expo-web-browser": "~15.0.10",
     "express": "^4.22.1",
+    "http-proxy-middleware": "^3.0.5",
     "multer": "^2.0.2",
     "pg": "^8.16.3",
     "react": "19.1.0",
@@ -86,11 +91,10 @@
     "@types/pg": "^8.16.0",
     "@types/react": "~19.1.0",
     "@types/react-test-renderer": "19.1.0",
-    "babel-plugin-module-resolver": "^5.0.2",
-    "babel-preset-expo": "^54.0.9",
     "chalk": "^4.1.2",
     "depcheck": "^1.4.7",
-    "eslint": "^9.27.0",
+    "esbuild": "0.27.2",
+    "eslint": "^9.39.2",
     "eslint-formatter-compact": "^9.0.1",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
@@ -108,5 +112,10 @@
   "packageManager": "pnpm@9.0.0",
   "engines": {
     "pnpm": ">=9.0.0"
+  },
+  "pnpm": {
+    "overrides": {
+      "esbuild": "0.27.2"
+    }
   }
 }

package/lib/__templates__/nextjs/package.json

@@ -42,7 +42,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "coze-coding-dev-sdk": "0.5.0",
+    "coze-coding-dev-sdk": "^0.5.2",
     "date-fns": "^4.1.0",
     "drizzle-kit": "^0.31.8",
     "drizzle-orm": "^0.45.1",

package/lib/__templates__/nextjs/pnpm-lock.yaml

@@ -105,8 +105,8 @@ importers:
         specifier: ^1.1.1
         version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       coze-coding-dev-sdk:
-        specifier: 0.5.0
-        version: 0.5.0(@types/pg@8.16.0)(openai@6.15.0(zod@4.3.5))
+        specifier: ^0.5.2
+        version: 0.5.4(@types/pg@8.16.0)(openai@6.15.0(zod@4.3.5))
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
@@ -2747,8 +2747,8 @@ packages:
       typescript:
         optional: true
 
-  coze-coding-dev-sdk@0.5.0:
-    resolution: {integrity: sha512-fmJypE4jgExKOOFSz26ZNRUyKmAh3FENKORXMfvP7JIbXmk092ntrnll9DCJ+HpNOcpdvlE5lTmGSvyGh9nwrw==}
+  coze-coding-dev-sdk@0.5.4:
+    resolution: {integrity: sha512-nIH2hMFlO2PSnqdslFzOITK+2FhR64caoYFuzy2ma+ceu0o2Spe7tLYLIsyUc42Prr5gXqk4MZESQqpXD34ZwQ==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -7931,7 +7931,7 @@ snapshots:
     optionalDependencies:
       typescript: 5.9.3
 
-  coze-coding-dev-sdk@0.5.0(@types/pg@8.16.0)(openai@6.15.0(zod@4.3.5)):
+  coze-coding-dev-sdk@0.5.4(@types/pg@8.16.0)(openai@6.15.0(zod@4.3.5)):
     dependencies:
       '@aws-sdk/client-s3': 3.962.0
       '@aws-sdk/lib-storage': 3.962.0(@aws-sdk/client-s3@3.962.0)

package/lib/__templates__/nextjs/scripts/dev.sh

@@ -4,44 +4,25 @@ set -Eeuo pipefail
 PORT=<%= port %>
 COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 NODE_ENV=development
+DEPLOY_RUN_PORT=<%= port %>
 
 cd "${COZE_WORKSPACE_PATH}"
 
 kill_port_if_listening() {
     local pids
-
-    # Check if lsof is available (macOS/BSD) or ss (Linux)
-    if command -v lsof >/dev/null 2>&1; then
-        # macOS/BSD using lsof
-        pids=$(lsof -ti:${PORT} 2>/dev/null || true)
-    elif command -v ss >/dev/null 2>&1; then
-        # Linux using ss
-        pids=$(ss -H -lntp 2>/dev/null | awk -v port="${PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
-    else
-        echo "Warning: neither lsof nor ss found, cannot check port ${PORT}"
-        return
-    fi
-
+    pids=$(ss -H -lntp 2>/dev/null | awk -v port="${DEPLOY_RUN_PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
     if [[ -z "${pids}" ]]; then
-      echo "Port ${PORT} is free."
+      echo "Port ${DEPLOY_RUN_PORT} is free."
       return
     fi
-
-    echo "Port ${PORT} in use by PIDs: ${pids} (SIGKILL)"
+    echo "Port ${DEPLOY_RUN_PORT} in use by PIDs: ${pids} (SIGKILL)"
     echo "${pids}" | xargs -I {} kill -9 {}
     sleep 1
-
-    # Verify port is cleared
-    if command -v lsof >/dev/null 2>&1; then
-        pids=$(lsof -ti:${PORT} 2>/dev/null || true)
-    elif command -v ss >/dev/null 2>&1; then
-        pids=$(ss -H -lntp 2>/dev/null | awk -v port="${PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
-    fi
-
+    pids=$(ss -H -lntp 2>/dev/null | awk -v port="${DEPLOY_RUN_PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
     if [[ -n "${pids}" ]]; then
-      echo "Warning: port ${PORT} still busy after SIGKILL, PIDs: ${pids}"
+      echo "Warning: port ${DEPLOY_RUN_PORT} still busy after SIGKILL, PIDs: ${pids}"
     else
-      echo "Port ${PORT} cleared."
+      echo "Port ${DEPLOY_RUN_PORT} cleared."
     fi
 }
 

package/lib/__templates__/nextjs/src/app/globals.css

@@ -1,59 +1,11 @@
 @import 'tailwindcss';
-@import "tw-animate-css";
+@import 'tw-animate-css';
 
 @custom-variant dark (&:is(.dark *));
 
-:root {
-  --background: 0 0% 100%;
-  --foreground: 0 0% 9%;
-  --card: 0 0% 100%;
-  --card-foreground: 0 0% 9%;
-  --popover: 0 0% 100%;
-  --popover-foreground: 0 0% 9%;
-  --primary: 0 0% 9%;
-  --primary-foreground: 0 0% 98%;
-  --secondary: 0 0% 96%;
-  --secondary-foreground: 0 0% 9%;
-  --muted: 0 0% 96%;
-  --muted-foreground: 0 0% 45%;
-  --accent: 0 0% 96%;
-  --accent-foreground: 0 0% 9%;
-  --destructive: 0 84% 60%;
-  --destructive-foreground: 0 0% 98%;
-  --border: 0 0% 90%;
-  --input: 0 0% 90%;
-  --ring: 0 0% 9%;
-  --radius: 0.5rem;
-  --sidebar: hsl(0 0% 98%);
-  --sidebar-foreground: hsl(240 5.3% 26.1%);
-  --sidebar-primary: hsl(240 5.9% 10%);
-  --sidebar-primary-foreground: hsl(0 0% 98%);
-  --sidebar-accent: hsl(240 4.8% 95.9%);
-  --sidebar-accent-foreground: hsl(240 5.9% 10%);
-  --sidebar-border: hsl(220 13% 91%);
-  --sidebar-ring: hsl(217.2 91.2% 59.8%);
-}
-
 @theme inline {
-  --color-background: hsl(var(--background));
-  --color-foreground: hsl(var(--foreground));
-  --color-card: hsl(var(--card));
-  --color-card-foreground: hsl(var(--card-foreground));
-  --color-popover: hsl(var(--popover));
-  --color-popover-foreground: hsl(var(--popover-foreground));
-  --color-primary: hsl(var(--primary));
-  --color-primary-foreground: hsl(var(--primary-foreground));
-  --color-secondary: hsl(var(--secondary));
-  --color-secondary-foreground: hsl(var(--secondary-foreground));
-  --color-muted: hsl(var(--muted));
-  --color-muted-foreground: hsl(var(--muted-foreground));
-  --color-accent: hsl(var(--accent));
-  --color-accent-foreground: hsl(var(--accent-foreground));
-  --color-destructive: hsl(var(--destructive));
-  --color-destructive-foreground: hsl(var(--destructive-foreground));
-  --color-border: hsl(var(--border));
-  --color-input: hsl(var(--input));
-  --color-ring: hsl(var(--ring));
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
   --font-sans: var(--font-geist-sans);
   --font-mono: var(--font-geist-mono);
   --color-sidebar-ring: var(--sidebar-ring);
@@ -64,47 +16,103 @@
   --color-sidebar-primary: var(--sidebar-primary);
   --color-sidebar-foreground: var(--sidebar-foreground);
   --color-sidebar: var(--sidebar);
+  --color-chart-5: var(--chart-5);
+  --color-chart-4: var(--chart-4);
+  --color-chart-3: var(--chart-3);
+  --color-chart-2: var(--chart-2);
+  --color-chart-1: var(--chart-1);
+  --color-ring: var(--ring);
+  --color-input: var(--input);
+  --color-border: var(--border);
+  --color-destructive: var(--destructive);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-accent: var(--accent);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-muted: var(--muted);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-secondary: var(--secondary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-primary: var(--primary);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-popover: var(--popover);
+  --color-card-foreground: var(--card-foreground);
+  --color-card: var(--card);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --radius-2xl: calc(var(--radius) + 8px);
+  --radius-3xl: calc(var(--radius) + 12px);
+  --radius-4xl: calc(var(--radius) + 16px);
 }
 
-@media (prefers-color-scheme: dark) {
-  :root {
-    --background: 0 0% 4%;
-    --foreground: 0 0% 93%;
-    --card: 0 0% 4%;
-    --card-foreground: 0 0% 93%;
-    --popover: 0 0% 4%;
-    --popover-foreground: 0 0% 93%;
-    --primary: 0 0% 98%;
-    --primary-foreground: 0 0% 9%;
-    --secondary: 0 0% 15%;
-    --secondary-foreground: 0 0% 98%;
-    --muted: 0 0% 15%;
-    --muted-foreground: 0 0% 64%;
-    --accent: 0 0% 15%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 63% 31%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 0 0% 15%;
-    --input: 0 0% 15%;
-    --ring: 0 0% 83%;
-  }
-}
-
-body {
-  background: hsl(var(--background));
-  color: hsl(var(--foreground));
-  font-family: Arial, Helvetica, sans-serif;
+:root {
+  --radius: 0.625rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.205 0 0);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.97 0 0);
+  --secondary-foreground: oklch(0.205 0 0);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.145 0 0);
+  --sidebar-primary: oklch(0.205 0 0);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.97 0 0);
+  --sidebar-accent-foreground: oklch(0.205 0 0);
+  --sidebar-border: oklch(0.922 0 0);
+  --sidebar-ring: oklch(0.708 0 0);
 }
 
 .dark {
-  --sidebar: hsl(240 5.9% 10%);
-  --sidebar-foreground: hsl(240 4.8% 95.9%);
-  --sidebar-primary: hsl(224.3 76.3% 48%);
-  --sidebar-primary-foreground: hsl(0 0% 100%);
-  --sidebar-accent: hsl(240 3.7% 15.9%);
-  --sidebar-accent-foreground: hsl(240 4.8% 95.9%);
-  --sidebar-border: hsl(240 3.7% 15.9%);
-  --sidebar-ring: hsl(217.2 91.2% 59.8%);
+  --background: oklch(0.145 0 0);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.205 0 0);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.205 0 0);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.922 0 0);
+  --primary-foreground: oklch(0.205 0 0);
+  --secondary: oklch(0.269 0 0);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.269 0 0);
+  --muted-foreground: oklch(0.708 0 0);
+  --accent: oklch(0.269 0 0);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.556 0 0);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.205 0 0);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.269 0 0);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.556 0 0);
 }
 
 @layer base {
@@ -115,3 +123,7 @@ body {
     @apply bg-background text-foreground;
   }
 }
+
+body {
+  @apply font-sans;
+}