@coze-arch/cli 0.0.1-alpha.3002ee → 0.0.1-alpha.3260db

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

@@ -0,0 +1,152 @@
+/**
+ * 安全路由 Hook - 完全代替原生的 useRouter 和 useLocalSearchParams
+ *
+ * 提供的 Hook：
+ * - useSafeRouter: 代替 useRouter，包含所有路由方法，并对 push/replace/navigate/setParams 进行安全编码
+ * - useSafeSearchParams: 代替 useLocalSearchParams，获取路由参数
+ *
+ * 解决的问题：
+ * 1. URI 编解码不对称 - useLocalSearchParams 会自动解码，但 router.push 不会自动编码，
+ *    当参数包含 % 等特殊字符时会拿到错误的值
+ * 2. 类型丢失 - URL 参数全是 string，Number/Boolean 类型会丢失
+ * 3. 嵌套对象无法传递 - URL search params 不支持嵌套结构
+ *
+ * 解决方案：
+ * 采用 Payload 模式，将所有参数打包成 JSON 并 Base64 编码后传递，
+ * 接收时再解码还原，确保数据完整性和类型安全。
+ *
+ * 优点：
+ * 1. 自动处理所有特殊字符（如 %、&、=、中文、Emoji 等）
+ * 2. 保留数据类型（Number、Boolean 不会变成 String）
+ * 3. 支持嵌套对象和数组传递
+ * 4. 三端兼容（iOS、Android、Web）
+ *
+ * 使用方式：
+ * ```tsx
+ * // 发送端 - 使用 useSafeRouter 代替 useRouter
+ * const router = useSafeRouter();
+ * router.push('/detail', { id: 123, uri: 'file:///path/%40test.mp3' });
+ * router.replace('/home', { tab: 'settings' });
+ * router.navigate('/profile', { userId: 456 });
+ * router.back();
+ * if (router.canGoBack()) { ... }
+ * router.setParams({ updated: true });
+ *
+ * // 接收端 - 使用 useSafeSearchParams 代替 useLocalSearchParams
+ * const { id, uri } = useSafeSearchParams<{ id: number; uri: string }>();
+ * ```
+ */
+import { useMemo } from 'react';
+import { useRouter as useExpoRouter, useLocalSearchParams as useExpoParams } from 'expo-router';
+import { Base64 } from 'js-base64';
+
+const PAYLOAD_KEY = '__safeRouterPayload__';
+const LOG_PREFIX = '[SafeRouter]';
+
+
+const getCurrentParams = (rawParams: Record<string, string | string[]>): Record<string, unknown> => {
+  const payload = rawParams[PAYLOAD_KEY];
+  if (payload && typeof payload === 'string') {
+    const decoded = deserializeParams<Record<string, unknown>>(payload);
+    if (decoded && Object.keys(decoded).length > 0) {
+      return decoded;
+    }
+  }
+  const { [PAYLOAD_KEY]: _, ...rest } = rawParams;
+  return rest as Record<string, unknown>;
+};
+
+const serializeParams = (params: Record<string, unknown>): string => {
+  try {
+    const jsonStr = JSON.stringify(params);
+    return Base64.encode(jsonStr);
+  } catch (error) {
+    console.error(LOG_PREFIX, 'serialize failed:', error instanceof Error ? error.message : 'Unknown error');
+    return '';
+  }
+};
+
+const deserializeParams = <T = Record<string, unknown>>(
+  payload: string | string[] | undefined
+): T | null => {
+  if (!payload || typeof payload !== 'string') {
+    return null;
+  }
+  try {
+    const jsonStr = Base64.decode(payload);
+    return JSON.parse(jsonStr) as T;
+  } catch (error) {
+    console.error(LOG_PREFIX, 'deserialize failed:', error instanceof Error ? error.message : 'Unknown error');
+    return null;
+  }
+};
+
+
+/**
+ * 安全路由 Hook，用于页面跳转，代替 useRouter
+ * @returns 路由方法（继承 useRouter 所有方法，并对以下方法进行安全编码）
+ * - push(pathname, params) - 入栈新页面
+ * - replace(pathname, params) - 替换当前页面
+ * - navigate(pathname, params) - 智能跳转（已存在则返回，否则 push）
+ * - setParams(params) - 更新当前页面参数（合并现有参数）
+ */
+export function useSafeRouter() {
+  const router = useExpoRouter();
+  const rawParams = useExpoParams<Record<string, string | string[]>>();
+
+  const push = (pathname: string, params: Record<string, unknown> = {}) => {
+    const encodedPayload = serializeParams(params);
+    router.push({
+      pathname: pathname as `/${string}`,
+      params: { [PAYLOAD_KEY]: encodedPayload },
+    });
+  };
+
+  const replace = (pathname: string, params: Record<string, unknown> = {}) => {
+    const encodedPayload = serializeParams(params);
+    router.replace({
+      pathname: pathname as `/${string}`,
+      params: { [PAYLOAD_KEY]: encodedPayload },
+    });
+  };
+
+  const navigate = (pathname: string, params: Record<string, unknown> = {}) => {
+    const encodedPayload = serializeParams(params);
+    router.navigate({
+      pathname: pathname as `/${string}`,
+      params: { [PAYLOAD_KEY]: encodedPayload },
+    });
+  };
+
+  const setParams = (params: Record<string, unknown>) => {
+    const currentParams = getCurrentParams(rawParams);
+    const mergedParams = { ...currentParams, ...params };
+    const encodedPayload = serializeParams(mergedParams);
+    router.setParams({ [PAYLOAD_KEY]: encodedPayload });
+  };
+
+  return {
+    ...router,
+    push,
+    replace,
+    navigate,
+    setParams,
+  };
+}
+
+/**
+ * 安全获取路由参数 Hook，用于接收方，代替 useLocalSearchParams
+ * 兼容两种跳转方式：
+ * 1. useSafeRouter 跳转 - 自动解码 Payload
+ * 2. 外部跳转（深链接、浏览器直接访问等）- 回退到原始参数
+ * @returns 解码后的参数对象，类型安全
+ */
+export function useSafeSearchParams<T = Record<string, unknown>>(): T {
+  const rawParams = useExpoParams<Record<string, string | string[]>>();
+
+  const decodedParams = useMemo(() => {
+    return getCurrentParams(rawParams) as T;
+  }, [rawParams]);
+
+  return decodedParams;
+}

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

@@ -0,0 +1,128 @@
+const { getDefaultConfig } = require('expo/metro-config');
+const { createProxyMiddleware } = require('http-proxy-middleware');
+const connect = require('connect');
+const { withUniwindConfig } = require('uniwind/metro');
+
+const config = getDefaultConfig(__dirname);
+
+// 安全地获取 Expo 的默认排除列表
+const existingBlockList = [].concat(config.resolver.blockList || []);
+
+config.resolver.blockList = [
+  ...existingBlockList,
+  /.*\/\.expo\/.*/, // Expo 的缓存和构建产物目录
+
+  // 1. 原生代码 (Java/C++/Objective-C)
+  /.*\/react-native\/ReactAndroid\/.*/,
+  /.*\/react-native\/ReactCommon\/.*/,
+
+  // 2. 纯开发和调试工具
+  // 这些工具只在开发电脑上运行，不会被打包到应用中
+  /.*\/@typescript-eslint\/eslint-plugin\/.*/,
+
+  // 3. 构建时数据
+  // 这个数据库只在打包过程中使用，应用运行时不需要
+  /.*\/caniuse-lite\/data\/.*/,
+
+  // 4. 通用规则
+  /.*\/__tests__\/.*/, // 排除所有测试目录
+  /.*\.git\/.*/, // 排除 Git 目录
+];
+
+const BACKEND_TARGET = 'http://localhost:9091';
+
+const apiProxy = createProxyMiddleware({
+  target: BACKEND_TARGET,
+  changeOrigin: true,
+  logLevel: 'debug',
+  proxyTimeout: 86400000,
+  onProxyReq: (proxyReq, req) => {
+    const accept = req.headers.accept || '';
+    if (accept.includes('text/event-stream')) {
+      proxyReq.setHeader('accept-encoding', 'identity');
+    }
+  },
+  onProxyRes: (proxyRes, req, res) => {
+    const contentType = proxyRes.headers['content-type'] || '';
+    if (contentType.includes('text/event-stream') || contentType.includes('application/stream')) {
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
+      res.setHeader('X-Accel-Buffering', 'no');
+      if (typeof res.flushHeaders === 'function') {
+        try { res.flushHeaders(); } catch {}
+      }
+    }
+  },
+});
+
+const streamProxy = createProxyMiddleware({
+  target: BACKEND_TARGET,
+  changeOrigin: true,
+  logLevel: 'debug',
+  ws: true,
+  proxyTimeout: 86400000,
+  onProxyReq: (proxyReq, req) => {
+    const upgrade = req.headers.upgrade;
+    const accept = req.headers.accept || '';
+    if (upgrade && upgrade.toLowerCase() === 'websocket') {
+      proxyReq.setHeader('Connection', 'upgrade');
+      proxyReq.setHeader('Upgrade', req.headers.upgrade);
+    } else if (accept.includes('text/event-stream')) {
+      proxyReq.setHeader('accept-encoding', 'identity');
+      proxyReq.setHeader('Connection', 'keep-alive');
+    }
+  },
+  onProxyRes: (proxyRes, req, res) => {
+    const contentType = proxyRes.headers['content-type'] || '';
+    if (contentType.includes('text/event-stream') || contentType.includes('application/stream')) {
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
+      res.setHeader('X-Accel-Buffering', 'no');
+      if (typeof res.flushHeaders === 'function') {
+        try { res.flushHeaders(); } catch {}
+      }
+    }
+  },
+});
+
+const shouldProxyToBackend = (url) => {
+  if (!url) return false;
+  if (/^\/api\/v\d+\//.test(url)) {
+    return true;
+  }
+  return false;
+};
+
+const isWebSocketRequest = (req) =>
+  !!(req.headers.upgrade && req.headers.upgrade.toLowerCase() === 'websocket');
+const isSSERequest = (req) => {
+  const accept = req.headers.accept || '';
+  return accept.includes('text/event-stream');
+};
+
+config.server = {
+  ...config.server,
+  enhanceMiddleware: (metroMiddleware, metroServer) => {
+    return connect()
+      .use((req, res, next) => {
+        if (shouldProxyToBackend(req.url)) {
+          console.log(`[Metro Proxy] Forwarding ${req.method} ${req.url}`);
+
+          if (isWebSocketRequest(req) || isSSERequest(req)) {
+            return streamProxy(req, res, next);
+          }
+          return apiProxy(req, res, next);
+        }
+        next();
+      })
+      .use(metroMiddleware);
+  },
+};
+
+module.exports = withUniwindConfig(config, {
+  // relative path to your global.css file (from previous step)
+  cssEntryFile: './global.css',
+  // (optional) path where we gonna auto-generate typings
+  // defaults to project's root
+  dtsFile: './uniwind-types.d.ts'
+});

package/lib/__templates__/expo/client/package.json

@@ -0,0 +1,100 @@
+{
+  "name": "expo-app",
+  "description": "<%= appName %>",
+  "main": "expo-router/entry",
+  "private": true,
+  "scripts": {
+    "check-deps": "npx depcheck",
+    "postinstall": "npm run install-missing",
+    "install-missing": "node ./scripts/install-missing-deps.js",
+    "lint": "expo lint",
+    "start": "expo start --web --clear",
+    "test": "jest --watchAll"
+  },
+  "jest": {
+    "preset": "jest-expo"
+  },
+  "dependencies": {
+    "@expo/metro-runtime": "~6.1.2",
+    "@expo/vector-icons": "^15.0.3",
+    "@react-native-async-storage/async-storage": "2.2.0",
+    "@react-native-community/datetimepicker": "8.4.4",
+    "@react-native-community/slider": "5.0.1",
+    "@react-native-masked-view/masked-view": "0.3.2",
+    "@react-native-picker/picker": "2.11.1",
+    "@react-navigation/bottom-tabs": "^7.2.0",
+    "@react-navigation/native": "^7.0.14",
+    "dayjs": "^1.11.19",
+    "expo": "54.0.33",
+    "expo-auth-session": "~7.0.10",
+    "expo-av": "~16.0.8",
+    "expo-blur": "~15.0.8",
+    "expo-camera": "~17.0.10",
+    "expo-constants": "~18.0.13",
+    "expo-crypto": "~15.0.8",
+    "expo-file-system": "~19.0.21",
+    "expo-font": "~14.0.11",
+    "expo-haptics": "~15.0.8",
+    "expo-image": "~3.0.11",
+    "expo-image-picker": "~17.0.10",
+    "expo-linear-gradient": "~15.0.8",
+    "expo-linking": "~8.0.11",
+    "expo-location": "~19.0.8",
+    "expo-router": "~6.0.23",
+    "expo-splash-screen": "~31.0.13",
+    "expo-status-bar": "~3.0.9",
+    "expo-symbols": "~1.0.8",
+    "expo-system-ui": "~6.0.9",
+    "expo-web-browser": "~15.0.10",
+    "js-base64": "^3.7.7",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native": "0.81.5",
+    "react-native-chart-kit": "^6.12.0",
+    "react-native-gesture-handler": "~2.28.0",
+    "react-native-keyboard-aware-scroll-view": "^0.9.5",
+    "react-native-modal-datetime-picker": "18.0.0",
+    "react-native-reanimated": "~4.1.1",
+    "react-native-safe-area-context": "~5.6.0",
+    "react-native-screens": "~4.16.0",
+    "react-native-svg": "15.12.1",
+    "react-native-toast-message": "^2.3.3",
+    "react-native-web": "~0.21.0",
+    "react-native-webview": "13.15.0",
+    "react-native-worklets": "0.5.1",
+    "zod": "^4.2.1",
+    "@gorhom/bottom-sheet": "^5.2.8",
+    "tailwind-merge": "^3.4.0",
+    "tailwind-variants": "^3.2.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@eslint/js": "^9.27.0",
+    "@types/jest": "^29.5.12",
+    "@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",
+    "connect": "^3.7.0",
+    "depcheck": "^1.4.7",
+    "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",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-regexp": "^2.10.0",
+    "globals": "^16.1.0",
+    "http-proxy-middleware": "^3.0.5",
+    "jest": "^29.2.1",
+    "jest-expo": "~54.0.17",
+    "react-test-renderer": "19.1.0",
+    "tsx": "^4.21.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.32.1",
+    "tailwindcss": "^4.1.18",
+    "uniwind": "^1.2.7"
+  }
+}

package/lib/__templates__/expo/client/screens/demo/index.tsx

@@ -0,0 +1,19 @@
+import { View, Text } from 'react-native';
+import { Image } from 'expo-image';
+
+import { Screen } from '@/components/Screen';
+
+export default function DemoPage() {
+  return (
+    <Screen backgroundColor="var(--background)" statusBarStyle="auto">
+      <View className="absolute top-0 left-0 w-full h-full flex flex-col items-center justify-center">
+        <Image
+          className="w-[130px] h-[109px]"
+          source="https://lf-coze-web-cdn.coze.cn/obj/eden-cn/lm-lgvj/ljhwZthlaukjlkulzlp/coze-coding/expo/coze-loading.gif"
+        />
+        <Text className="text-base font-bold text-foreground">APP 开发中</Text>
+        <Text className="text-sm mt-2 text-muted">即将为您呈现应用界面</Text>
+      </View>
+    </Screen>
+  );
+}

package/lib/__templates__/expo/client/scripts/install-missing-deps.js

@@ -38,6 +38,7 @@ try {
   const ignoreFilePatterns = [
     /template\.config\.(ts|js)$/, // 模板配置文件
     /\.template\./, // 其他模板文件
+    /declarations\.d\.ts$/, // 项目配置文件
   ];
 
   // 过滤包：排除内部别名和只被模板文件引用的包

package/lib/__templates__/expo/client/theme.css

@@ -0,0 +1,263 @@
+@theme {
+  /* Primitive Colors (Do not change between light and dark) */
+  --white: oklch(100% 0 0);
+  --black: oklch(0% 0 0);
+  --snow: oklch(0.9911 0 0);
+  --eclipse: oklch(0.2103 0.0059 285.89);
+
+  /* Border */
+  --border-width: 1px;
+  --field-border-width: 0px;
+
+  /* Base radius */
+  --radius: 0.5rem;
+  --field-radius: calc(var(--radius) * 1.5);
+
+  /* Opacity */
+  --opacity-disabled: 0.5;
+}
+
+@layer theme {
+  :root {
+    @variant light {
+      /* Base Colors */
+      --background: oklch(0.9702 0 0);
+      --foreground: var(--eclipse);
+
+      /* Surface: Used for non-overlay components (cards, accordions, disclosure groups) */
+      --surface: var(--white);
+      --surface-foreground: var(--foreground);
+
+      /* Overlay: Used for floating/overlay components (dialogs, popovers, modals, menus) */
+      --overlay: var(--white);
+      --overlay-foreground: var(--foreground);
+
+      --muted: oklch(0.5517 0.0138 285.94);
+
+      --default: oklch(94% 0.001 286.375);
+      --default-foreground: var(--eclipse);
+
+      --accent: oklch(0.6204 0.195 253.83);
+      --accent-foreground: var(--snow);
+
+      /* Form Fields */
+      --field-background: var(--white);
+      --field-foreground: oklch(0.2103 0.0059 285.89);
+      --field-placeholder: var(--muted);
+      --field-border: transparent; /* no border by default on form fields */
+
+      /* Status Colors */
+      --success: oklch(0.7329 0.1935 150.81);
+      --success-foreground: var(--eclipse);
+
+      --warning: oklch(0.7819 0.1585 72.33);
+      --warning-foreground: var(--eclipse);
+
+      --danger: oklch(0.6532 0.2328 25.74);
+      --danger-foreground: var(--snow);
+
+      /* Component Colors */
+      --segment: var(--white);
+      --segment-foreground: var(--eclipse);
+
+      /* Misc Colors */
+      --border: oklch(90% 0.004 286.32);
+      --separator: oklch(74% 0.004 286.32);
+      --focus: var(--accent);
+      --link: var(--foreground);
+
+      /* Shadows */
+      --surface-shadow:
+        0 2px 4px 0 rgba(0, 0, 0, 0.04), 0 1px 2px 0 rgba(0, 0, 0, 0.06),
+        0 0 1px 0 rgba(0, 0, 0, 0.06);
+      --overlay-shadow:
+        0 2px 8px 0 rgba(0, 0, 0, 0.04), 0 -6px 12px 0 rgba(0, 0, 0, 0.02),
+        0 14px 28px 0 rgba(0, 0, 0, 0.06);
+      --field-shadow:
+        0 2px 4px 0 rgba(0, 0, 0, 0.04), 0 1px 2px 0 rgba(0, 0, 0, 0.06),
+        0 0 1px 0 rgba(0, 0, 0, 0.06);
+    }
+
+    @variant dark {
+      /* Base Colors */
+      --background: oklch(12% 0.005 285.823);
+      --foreground: var(--snow);
+
+      /* Surface: Used for non-overlay components (cards, accordions, disclosure groups) */
+      --surface: oklch(0.2103 0.0059 285.89);
+      --surface-foreground: var(--foreground);
+
+      /* Overlay: Used for floating/overlay components (dialogs, popovers, modals, menus) - lighter for contrast */
+      --overlay: oklch(0.2103 0.0059 285.89);
+      --overlay-foreground: var(--foreground);
+
+      --muted: oklch(70.5% 0.015 286.067);
+
+      --default: oklch(27.4% 0.006 286.033);
+      --default-foreground: var(--snow);
+
+      --accent: oklch(0.6204 0.195 253.83);
+      --accent-foreground: var(--snow);
+
+      /* Form Field Defaults - Colors (only the ones that are different from light theme) */
+      --field-background: oklch(0.2103 0.0059 285.89);
+      --field-foreground: var(--foreground);
+      --field-placeholder: var(--muted);
+      --field-border: transparent; /* no border by default on form fields */
+
+      /* Status Colors */
+      --success: oklch(0.7329 0.1935 150.81);
+      --success-foreground: var(--eclipse);
+
+      --warning: oklch(0.8203 0.1388 76.34);
+      --warning-foreground: var(--eclipse);
+
+      --danger: oklch(0.594 0.1967 24.63);
+      --danger-foreground: var(--snow);
+
+      /* Component Colors */
+      --segment: oklch(0.3964 0.01 285.93);
+      --segment-foreground: var(--foreground);
+
+      /* Misc Colors */
+      --border: oklch(28% 0.006 286.033);
+      --separator: oklch(40% 0.006 286.033);
+      --focus: var(--accent);
+      --link: var(--foreground);
+
+      /* Shadows */
+      --surface-shadow: 0 0 0 0 transparent inset; /* No shadow on dark mode */
+      --overlay-shadow: 0 0 1px 0 rgba(255, 255, 255, 0.2) inset;
+      --field-shadow: 0 0 0 0 transparent inset; /* Transparent shadow to allow ring utilities to work */
+    }
+  }
+}
+
+@theme inline static {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+
+  --color-surface: var(--surface);
+  --color-surface-foreground: var(--surface-foreground);
+  --color-surface-hover: color-mix(in oklab, var(--surface) 92%, var(--surface-foreground) 8%);
+
+  --color-overlay: var(--overlay);
+  --color-overlay-foreground: var(--overlay-foreground);
+
+  --color-muted: var(--muted);
+
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+
+  --color-segment: var(--segment);
+  --color-segment-foreground: var(--segment-foreground);
+
+  --color-border: var(--border);
+  --color-separator: var(--separator);
+  --color-focus: var(--focus);
+  --color-link: var(--link);
+
+  --color-default: var(--default);
+  --color-default-foreground: var(--default-foreground);
+
+  --color-success: var(--success);
+  --color-success-foreground: var(--success-foreground);
+
+  --color-warning: var(--warning);
+  --color-warning-foreground: var(--warning-foreground);
+
+  --color-danger: var(--danger);
+  --color-danger-foreground: var(--danger-foreground);
+
+  /* Form Field Tokens */
+  --color-field: var(--field-background, var(--default));
+  --color-field-foreground: var(--field-foreground, var(--foreground));
+  --color-field-placeholder: var(--field-placeholder, var(--muted));
+  --color-field-border: var(--field-border, var(--border));
+  --radius-field: var(--field-radius, var(--radius-xl));
+  --border-width-field: var(--field-border-width, var(--border-width));
+
+  --shadow-surface: var(--surface-shadow);
+  --shadow-overlay: var(--overlay-shadow);
+  --shadow-field: var(--field-shadow);
+
+  /* Calculated Variables */
+
+  /* Colors */
+
+  /* --- background shades --- */
+  --color-background-secondary: color-mix(in oklab, var(--background) 96%, var(--foreground) 4%);
+  --color-background-tertiary: color-mix(in oklab, var(--background) 92%, var(--foreground) 8%);
+  --color-background-inverse: var(--foreground);
+
+  /* ------------------------- */
+  --color-default-hover: color-mix(in oklab, var(--default) 96%, var(--default-foreground) 4%);
+  --color-accent-hover: color-mix(in oklab, var(--accent) 90%, var(--accent-foreground) 10%);
+  --color-success-hover: color-mix(in oklab, var(--success) 90%, var(--success-foreground) 10%);
+  --color-warning-hover: color-mix(in oklab, var(--warning) 90%, var(--warning-foreground) 10%);
+  --color-danger-hover: color-mix(in oklab, var(--danger) 90%, var(--danger-foreground) 10%);
+
+  /* Form Field Colors */
+  --color-field-hover: color-mix(in oklab, var(--field-background, var(--default)) 90%, var(--field-foreground, var(--foreground)) 2%);
+  --color-field-focus: var(--field-background, var(--default));
+  --color-field-border-hover: color-mix(in oklab, var(--field-border, var(--border)) 88%, var(--field-foreground, var(--foreground)) 10%);
+  --color-field-border-focus: color-mix(in oklab, var(--field-border, var(--border)) 74%, var(--field-foreground, var(--foreground)) 22%);
+
+  /* Soft Colors */
+  --color-accent-soft: color-mix(in oklab, var(--accent) 15%, transparent);
+  --color-accent-soft-foreground: var(--accent);
+  --color-accent-soft-hover: color-mix(in oklab, var(--accent) 20%, transparent);
+
+  --color-danger-soft: color-mix(in oklab, var(--danger) 15%, transparent);
+  --color-danger-soft-foreground: var(--danger);
+  --color-danger-soft-hover: color-mix(in oklab, var(--danger) 20%, transparent);
+
+  --color-warning-soft: color-mix(in oklab, var(--warning) 15%, transparent);
+  --color-warning-soft-foreground: var(--warning);
+  --color-warning-soft-hover: color-mix(in oklab, var(--warning) 20%, transparent);
+
+  --color-success-soft: color-mix(in oklab, var(--success) 15%, transparent);
+  --color-success-soft-foreground: var(--success);
+  --color-success-soft-hover: color-mix(in oklab, var(--success) 20%, transparent);
+
+  /* Surface Levels - progressively darker/lighter shades for layering */
+  --color-surface-secondary: color-mix(in oklab, var(--surface) 94%, var(--surface-foreground) 6%);
+  --color-surface-tertiary: color-mix(in oklab, var(--surface) 92%, var(--surface-foreground) 8%);
+
+  /* On Surface Colors */
+  --color-on-surface: color-mix(in oklab, var(--surface) 93%, var(--surface-foreground) 7%);
+  --color-on-surface-foreground: var(--surface-foreground);
+  --color-on-surface-hover: color-mix(in oklab, var(--surface) 91%, var(--surface-foreground) 9%);
+  --color-on-surface-focus: color-mix(in oklab, var(--surface) 93%, var(--surface-foreground) 7%);
+
+  /* On Surface Colors - Secondary (on secondary surface) */
+  --color-on-surface-secondary: color-mix(in oklab, var(--surface) 87%, var(--surface-foreground) 13%);
+  --color-on-surface-secondary-foreground: var(--surface-foreground);
+  --color-on-surface-secondary-hover: color-mix(in oklab, var(--surface) 85%, var(--surface-foreground) 15%);
+  --color-on-surface-secondary-focus: color-mix(in oklab, var(--surface) 87%, var(--surface-foreground) 13%);
+
+   /* On Surface Colors - Tertiary (on tertiary surface) */
+  --color-on-surface-tertiary: color-mix(in oklab, var(--surface) 85%, var(--surface-foreground) 15%);
+  --color-on-surface-tertiary-foreground: var(--surface-foreground);
+  --color-on-surface-tertiary-hover: color-mix(in oklab, var(--surface) 84%, var(--surface-foreground) 16%);
+  --color-on-surface-tertiary-focus: color-mix(in oklab, var(--surface) 85%, var(--surface-foreground) 15%);
+
+  /* Separator Colors - Levels */
+  --color-separator-secondary: color-mix(in oklab, var(--surface) 85%, var(--surface-foreground) 15%);
+  --color-separator-tertiary: color-mix(in oklab, var(--surface) 81%, var(--surface-foreground) 19%);
+
+  /* Border Colors - Levels (progressive contrast: default → secondary → tertiary) */
+  /* Light mode: lighter → darker | Dark mode: darker → lighter */
+  --color-border-secondary: color-mix(in oklab, var(--surface) 78%, var(--surface-foreground) 22%);
+  --color-border-tertiary: color-mix(in oklab, var(--surface) 66%, var(--surface-foreground) 34%);
+
+  /* Radius and default sizes - defaults can change by just changing the --radius */
+  --radius-xs: calc(var(--radius) * 0.25); /* 0.125rem (2px) */
+  --radius-sm: calc(var(--radius) * 0.5); /* 0.25rem (4px) */
+  --radius-md: calc(var(--radius) * 0.75); /* 0.375rem (6px) */
+  --radius-lg: calc(var(--radius) * 1); /* 0.5rem (8px) */
+  --radius-xl: calc(var(--radius) * 1.5); /* 0.75rem (12px) */
+  --radius-2xl: calc(var(--radius) * 2); /* 1rem (16px) */
+  --radius-3xl: calc(var(--radius) * 3); /* 1.5rem (24px) */
+  --radius-4xl: calc(var(--radius) * 4); /* 2rem (32px) */
+}