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

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { generateConfigFile } from './chunk-3BBXDQ4Y.js';
-import './chunk-GSMXGUYF.js';
+import { generateConfigFile } from './chunk-CFCXOKGV.js';
+import './chunk-5IGMJVV5.js';
 import './chunk-2H7UOFLK.js';
 import process3 from 'process';
 import { core } from '@h-ai/core';
@@ -12,6 +12,7 @@ import fse from 'fs-extra';
 import Handlebars from 'handlebars';
 import ora from 'ora';
 import prompts from 'prompts';
+import { Buffer } from 'buffer';
 import { execSync, execFileSync } from 'child_process';
 import { existsSync, readFileSync } from 'fs';
 import { parse } from 'yaml';
@@ -98,7 +99,6 @@ registerHelpers();
 Handlebars.registerHelper("if_eq", function(a, b, options) {
   return a === b ? options.fn(this) : options.inverse(this);
 });
-var HAI_VERSION = `^${getCliVersion()}`;
 var TEMPLATE_SKIP_IF_EMPTY_MARKER = "@skipIfEmpty";
 var NORMALIZED_RENDER_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".js", ".svelte", ".json", ".css"]);
 var CAPACITOR_SKIPPED_SERVER_FILES = /* @__PURE__ */ new Set([
@@ -107,15 +107,22 @@ var CAPACITOR_SKIPPED_SERVER_FILES = /* @__PURE__ */ new Set([
 ]);
 var VERSIONS = {
   antfuEslintConfig: "^9.0.0",
-  apiContract: HAI_VERSION,
-  apiClient: HAI_VERSION,
-  core: HAI_VERSION,
-  serv: HAI_VERSION,
-  ui: HAI_VERSION,
+  capacitorSecureStorage: "^8.0.0",
   // UI / Icon
   bitsUi: "^2.18.1",
   iconifyJsonTabler: "^1.2.35",
   iconifyTailwind: "^1.2.3",
+  // Capacitor
+  capacitorAndroid: "^8.3.4",
+  capacitorApp: "^8.0.1",
+  capacitorCamera: "^8.0.1",
+  capacitorCli: "^8.3.4",
+  capacitorCore: "^8.3.4",
+  capacitorDevice: "^8.0.1",
+  capacitorIos: "^8.3.4",
+  capacitorPreferences: "^8.0.1",
+  capacitorPushNotifications: "^8.0.1",
+  capacitorStatusBar: "^8.0.1",
   // Tailwind / DaisyUI
   daisyui: "^5.5.20",
   tailwindcss: "^4.3.0",
@@ -123,13 +130,10 @@ var VERSIONS = {
   // i18n
   inlangParaglide: "^2.18.1",
   inlangMessageFormat: "^4.4.0",
-  // Svelte / Kit
+  // Svelte / Vite
   svelte: "^5.55.9",
-  svelteKit: "^2.61.1",
   svelteCheck: "^4.4.8",
   sveltePlugin: "^7.1.2",
-  adapterAuto: "^7.0.1",
-  adapterStatic: "^3.0.10",
   // Build / Test
   vite: "^8.0.14",
   vitest: "^4.1.7",
@@ -146,12 +150,14 @@ var VERSIONS = {
   // E2E
   playwright: "^1.60.0",
   // Validation
-  zod: "^4.4.3"
+  zod: "^4.4.3",
+  // Tauri
+  tauriCli: "^2.10.1"
 };
 var FRONTEND_PORTS_DEFAULT = {
   web: 4173,
-  app: 4174,
-  desktop: 4175
+  app: 5175,
+  desktop: 5176
 };
 var FRONTEND_LABELS = {
   web: "Web",
@@ -163,6 +169,277 @@ var IMPLEMENTED_FRONTENDS = ["web", "app", "desktop"];
 var DEFAULT_FULLSTACK_FRONTENDS = ["web", "app", "desktop"];
 var DEFAULT_THEMES = ["light", "dark"];
 var DEFAULT_THEME_NAME = "light";
+var HAI_PACKAGE_VERSION = `^${getCliVersion()}`;
+var HAI_PACKAGE_SPECIFIER_CATALOG = "catalog:";
+var HAI_CATALOG_PACKAGE_NAMES = [
+  "@h-ai/ai",
+  "@h-ai/api-client",
+  "@h-ai/api-contract",
+  "@h-ai/audit",
+  "@h-ai/cache",
+  "@h-ai/capacitor",
+  "@h-ai/core",
+  "@h-ai/crypto",
+  "@h-ai/datapipe",
+  "@h-ai/deploy",
+  "@h-ai/iam",
+  "@h-ai/kit",
+  "@h-ai/payment",
+  "@h-ai/reach",
+  "@h-ai/reldb",
+  "@h-ai/scheduler",
+  "@h-ai/serv",
+  "@h-ai/storage",
+  "@h-ai/ui",
+  "@h-ai/vecdb"
+];
+var HAI_CATALOG_PACKAGES = Object.fromEntries(
+  HAI_CATALOG_PACKAGE_NAMES.map((packageName) => [packageName, HAI_PACKAGE_VERSION])
+);
+var FULLSTACK_EXTERNAL_CATALOG_PACKAGES = {
+  "@antfu/eslint-config": VERSIONS.antfuEslintConfig,
+  "@aparajita/capacitor-secure-storage": VERSIONS.capacitorSecureStorage,
+  "@capacitor/android": VERSIONS.capacitorAndroid,
+  "@capacitor/app": VERSIONS.capacitorApp,
+  "@capacitor/camera": VERSIONS.capacitorCamera,
+  "@capacitor/cli": VERSIONS.capacitorCli,
+  "@capacitor/core": VERSIONS.capacitorCore,
+  "@capacitor/device": VERSIONS.capacitorDevice,
+  "@capacitor/ios": VERSIONS.capacitorIos,
+  "@capacitor/preferences": VERSIONS.capacitorPreferences,
+  "@capacitor/push-notifications": VERSIONS.capacitorPushNotifications,
+  "@capacitor/status-bar": VERSIONS.capacitorStatusBar,
+  "@iconify-json/tabler": VERSIONS.iconifyJsonTabler,
+  "@iconify/tailwind4": VERSIONS.iconifyTailwind,
+  "@inlang/paraglide-js": VERSIONS.inlangParaglide,
+  "@inlang/plugin-message-format": VERSIONS.inlangMessageFormat,
+  "@playwright/test": VERSIONS.playwright,
+  "@sveltejs/vite-plugin-svelte": VERSIONS.sveltePlugin,
+  "@tailwindcss/vite": VERSIONS.tailwindcssVite,
+  "@tauri-apps/cli": VERSIONS.tauriCli,
+  "@types/node": VERSIONS.nodeTypes,
+  "bits-ui": VERSIONS.bitsUi,
+  "daisyui": VERSIONS.daisyui,
+  "eslint": VERSIONS.eslint,
+  "eslint-plugin-format": VERSIONS.eslintPluginFormat,
+  "eslint-plugin-svelte": VERSIONS.eslintPluginSvelte,
+  "rimraf": VERSIONS.rimraf,
+  "svelte": VERSIONS.svelte,
+  "svelte-check": VERSIONS.svelteCheck,
+  "svelte-eslint-parser": VERSIONS.svelteEslintParser,
+  "tailwindcss": VERSIONS.tailwindcss,
+  "tsup": VERSIONS.tsup,
+  "typescript": VERSIONS.typescript,
+  "vite": VERSIONS.vite,
+  "vitest": VERSIONS.vitest,
+  "zod": VERSIONS.zod
+};
+var FULLSTACK_CATALOG_PACKAGES = {
+  ...HAI_CATALOG_PACKAGES,
+  ...FULLSTACK_EXTERNAL_CATALOG_PACKAGES
+};
+var FULLSTACK_ROOT_CATALOG_PACKAGE_NAMES = [
+  "@antfu/eslint-config",
+  "@playwright/test",
+  "@sveltejs/vite-plugin-svelte",
+  "@types/node",
+  "eslint",
+  "eslint-plugin-format",
+  "eslint-plugin-svelte",
+  "rimraf",
+  "svelte",
+  "svelte-check",
+  "svelte-eslint-parser",
+  "tsup",
+  "typescript",
+  "vite",
+  "vitest"
+];
+var FULLSTACK_CONTRACT_CATALOG_PACKAGE_NAMES = [
+  "@h-ai/api-contract",
+  "@h-ai/core",
+  "zod"
+];
+var FULLSTACK_SERV_CATALOG_PACKAGE_NAMES = [
+  "@h-ai/core",
+  "@h-ai/serv"
+];
+var FULLSTACK_SHARED_CATALOG_PACKAGE_NAMES = [
+  "@h-ai/api-client",
+  "@h-ai/ui",
+  "@inlang/paraglide-js",
+  "@inlang/plugin-message-format",
+  "svelte",
+  "svelte-check",
+  "typescript",
+  "vite",
+  "vitest"
+];
+var FULLSTACK_WEB_CATALOG_PACKAGE_NAMES = [
+  "@antfu/eslint-config",
+  "@h-ai/ui",
+  "@iconify-json/tabler",
+  "@iconify/tailwind4",
+  "@inlang/paraglide-js",
+  "@inlang/plugin-message-format",
+  "@sveltejs/vite-plugin-svelte",
+  "@tailwindcss/vite",
+  "bits-ui",
+  "daisyui",
+  "eslint",
+  "eslint-plugin-format",
+  "eslint-plugin-svelte",
+  "svelte",
+  "svelte-check",
+  "svelte-eslint-parser",
+  "tailwindcss",
+  "typescript",
+  "vite",
+  "vitest"
+];
+var FULLSTACK_APP_CATALOG_PACKAGE_NAMES = [
+  ...FULLSTACK_WEB_CATALOG_PACKAGE_NAMES,
+  "@aparajita/capacitor-secure-storage",
+  "@capacitor/android",
+  "@capacitor/app",
+  "@capacitor/camera",
+  "@capacitor/cli",
+  "@capacitor/core",
+  "@capacitor/device",
+  "@capacitor/ios",
+  "@capacitor/preferences",
+  "@capacitor/push-notifications",
+  "@capacitor/status-bar",
+  "@h-ai/capacitor"
+];
+var FULLSTACK_DESKTOP_CATALOG_PACKAGE_NAMES = [
+  ...FULLSTACK_WEB_CATALOG_PACKAGE_NAMES,
+  "@tauri-apps/cli"
+];
+var API_WORKSPACE_EXTERNAL_CATALOG_PACKAGE_NAMES = [
+  "@antfu/eslint-config",
+  "@playwright/test",
+  "@types/node",
+  "eslint",
+  "eslint-plugin-format",
+  "rimraf",
+  "tsup",
+  "typescript",
+  "vitest",
+  "zod"
+];
+function pickCatalogPackages(packageNames, availableCatalogPackages) {
+  return Object.fromEntries(
+    [...new Set(packageNames)].sort((left, right) => left.localeCompare(right)).map((packageName) => {
+      const version = availableCatalogPackages[packageName];
+      if (!version) {
+        throw new Error(`Missing catalog version for package "${packageName}"`);
+      }
+      return [packageName, version];
+    })
+  );
+}
+function buildFullstackPackageSpecifiers(useCatalogProtocol) {
+  return Object.fromEntries(
+    Object.entries(VERSIONS).map(([key, version]) => [key, useCatalogProtocol ? HAI_PACKAGE_SPECIFIER_CATALOG : version])
+  );
+}
+function buildApiWorkspaceCatalogPackages(featureMap) {
+  const packageNames = [
+    ...API_WORKSPACE_EXTERNAL_CATALOG_PACKAGE_NAMES,
+    "@h-ai/api-client",
+    "@h-ai/api-contract",
+    "@h-ai/core",
+    "@h-ai/serv"
+  ];
+  if (featureMap.db)
+    packageNames.push("@h-ai/reldb");
+  if (featureMap.cache)
+    packageNames.push("@h-ai/cache");
+  if (featureMap.iam)
+    packageNames.push("@h-ai/iam");
+  if (featureMap.crypto)
+    packageNames.push("@h-ai/crypto");
+  if (featureMap.storage)
+    packageNames.push("@h-ai/storage");
+  if (featureMap.ai)
+    packageNames.push("@h-ai/ai");
+  if (featureMap.audit)
+    packageNames.push("@h-ai/audit");
+  if (featureMap.reach)
+    packageNames.push("@h-ai/reach");
+  if (featureMap.payment)
+    packageNames.push("@h-ai/payment");
+  if (featureMap.vecdb)
+    packageNames.push("@h-ai/vecdb");
+  if (featureMap.datapipe)
+    packageNames.push("@h-ai/datapipe");
+  if (featureMap.scheduler)
+    packageNames.push("@h-ai/scheduler");
+  if (featureMap.deploy)
+    packageNames.push("@h-ai/deploy");
+  return pickCatalogPackages(packageNames, FULLSTACK_CATALOG_PACKAGES);
+}
+function buildAppHaiCatalogPackages(options) {
+  const packageNames = [];
+  if (options.isSvelteOnlyApp) {
+    packageNames.push("@h-ai/api-client", "@h-ai/capacitor", "@h-ai/ui");
+    return pickCatalogPackages(packageNames, HAI_CATALOG_PACKAGES);
+  }
+  packageNames.push("@h-ai/core", "@h-ai/kit");
+  if (options.hasUi)
+    packageNames.push("@h-ai/ui");
+  if (options.featureMap.db)
+    packageNames.push("@h-ai/reldb");
+  if (options.featureMap.cache)
+    packageNames.push("@h-ai/cache");
+  if (options.featureMap.iam)
+    packageNames.push("@h-ai/iam");
+  if (options.featureMap.crypto)
+    packageNames.push("@h-ai/crypto");
+  if (options.featureMap.storage)
+    packageNames.push("@h-ai/storage");
+  if (options.featureMap.ai)
+    packageNames.push("@h-ai/ai");
+  if (options.featureMap.audit)
+    packageNames.push("@h-ai/audit");
+  if (options.featureMap.reach)
+    packageNames.push("@h-ai/reach");
+  if (options.featureMap.payment)
+    packageNames.push("@h-ai/payment");
+  if (options.featureMap.vecdb)
+    packageNames.push("@h-ai/vecdb");
+  if (options.featureMap.datapipe)
+    packageNames.push("@h-ai/datapipe");
+  if (options.featureMap.scheduler)
+    packageNames.push("@h-ai/scheduler");
+  if (options.featureMap.deploy)
+    packageNames.push("@h-ai/deploy");
+  if (options.featureMap["api-client"])
+    packageNames.push("@h-ai/api-client");
+  if (options.featureMap.capacitor)
+    packageNames.push("@h-ai/capacitor");
+  if (options.isCapacitorApp && !options.featureMap["api-client"])
+    packageNames.push("@h-ai/api-client");
+  if (options.isCapacitorApp && !options.featureMap.capacitor)
+    packageNames.push("@h-ai/capacitor");
+  return pickCatalogPackages(packageNames, HAI_CATALOG_PACKAGES);
+}
+function buildFullstackCatalogPackages(frontends) {
+  const packageNames = [
+    ...FULLSTACK_ROOT_CATALOG_PACKAGE_NAMES,
+    ...FULLSTACK_CONTRACT_CATALOG_PACKAGE_NAMES,
+    ...FULLSTACK_SERV_CATALOG_PACKAGE_NAMES,
+    ...FULLSTACK_SHARED_CATALOG_PACKAGE_NAMES
+  ];
+  if (frontends.includes("web"))
+    packageNames.push(...FULLSTACK_WEB_CATALOG_PACKAGE_NAMES);
+  if (frontends.includes("app"))
+    packageNames.push(...FULLSTACK_APP_CATALOG_PACKAGE_NAMES);
+  if (frontends.includes("desktop"))
+    packageNames.push(...FULLSTACK_DESKTOP_CATALOG_PACKAGE_NAMES);
+  return pickCatalogPackages(packageNames, FULLSTACK_CATALOG_PACKAGES);
+}
 var FEATURE_ROUTE_DIRS = {
   iam: ["routes-shared"],
   storage: ["routes"],
@@ -179,6 +456,7 @@ var FEATURE_APP_ROUTE_DIRS = {
 };
 var FEATURE_ID_REGEX = /^[a-z0-9-]+$/;
 var HBS_SUFFIX_REGEX = /\.hbs$/;
+var FULLSTACK_FRONTEND_TEMPLATE_PATH_REGEX = /^apps\/\{\{projectName\}\}-(web|app|desktop|miniapp)\//;
 var NON_IDENTIFIER_CHAR_REGEX = /[^a-z0-9]+/i;
 var IDENTIFIER_START_REGEX = /^[a-z_$]/i;
 function getTemplatesRoot() {
@@ -229,6 +507,28 @@ async function findHbsFiles(dir) {
   await walk(dir);
   return results;
 }
+async function findRenderedStaticPathFiles(dir) {
+  if (!await fse.pathExists(dir)) {
+    return [];
+  }
+  const results = [];
+  async function walk(current) {
+    const entries = await fse.readdir(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path2.join(current, entry.name);
+      if (entry.isDirectory()) {
+        await walk(fullPath);
+        continue;
+      }
+      const relPath = path2.relative(dir, fullPath);
+      if (!entry.name.endsWith(".hbs") && (relPath.includes("{{") || relPath.includes("}}"))) {
+        results.push(relPath);
+      }
+    }
+  }
+  await walk(dir);
+  return results;
+}
 function buildTemplateContext(options) {
   const featureMap = {};
   for (const f of options.features) {
@@ -244,24 +544,62 @@ function buildTemplateContext(options) {
   }
   const isApi = options.appType === "api";
   const isFullstack = options.appType === "fullstack";
-  const isCapacitorApp = options.appType === "android-app";
+  const isCapacitorApp = options.appType === "mobile-app";
+  const isSvelteOnlyApp = isCapacitorApp;
+  const useCatalogProtocol = options.packageManager === "pnpm";
+  const hasUi = !isApi && !isFullstack;
+  const selectedFrontends = options.frontends ?? DEFAULT_FULLSTACK_FRONTENDS;
+  let haiCatalogPackages;
+  if (isFullstack) {
+    haiCatalogPackages = buildFullstackCatalogPackages(selectedFrontends);
+  } else if (isApi) {
+    haiCatalogPackages = buildApiWorkspaceCatalogPackages(featureMap);
+  } else {
+    haiCatalogPackages = buildAppHaiCatalogPackages({
+      featureMap,
+      hasUi,
+      isCapacitorApp,
+      isSvelteOnlyApp
+    });
+  }
   return {
     projectName: options.name,
+    useCatalogProtocol,
+    haiPackageSpecifier: useCatalogProtocol ? HAI_PACKAGE_SPECIFIER_CATALOG : HAI_PACKAGE_VERSION,
+    haiPackageVersion: HAI_PACKAGE_VERSION,
+    haiCatalogPackages,
     appType: options.appType,
     features: featureMap,
-    hasUi: !isApi && !isFullstack,
+    hasUi,
     hasI18n: !isApi && !isFullstack,
     isCapacitorApp,
+    isApiWorkspace: isApi,
+    isSvelteOnlyApp,
     defaultLocale: options.moduleConfigs?.core?.defaultLocale ?? "zh-CN",
     packageManager: options.packageManager,
+    api: isApi ? buildApiWorkspaceTemplateContext(options.name, useCatalogProtocol) : void 0,
     fullstack: isFullstack ? buildFullstackTemplateContext(
       options.name,
-      options.frontends ?? DEFAULT_FULLSTACK_FRONTENDS,
-      options.moduleConfigs
+      selectedFrontends,
+      options.moduleConfigs,
+      useCatalogProtocol
     ) : void 0
   };
 }
-function buildFullstackTemplateContext(projectName, frontendsInput, moduleConfigs) {
+function buildApiWorkspaceTemplateContext(projectName, useCatalogProtocol = false) {
+  const identifier = toIdentifier(projectName);
+  const pascalName = toPascalIdentifier(identifier);
+  return {
+    versions: VERSIONS,
+    packageSpecifiers: buildFullstackPackageSpecifiers(useCatalogProtocol),
+    contractPackageName: `${projectName}-contract`,
+    contractExportName: `${identifier}Contract`,
+    servicePackageName: `${projectName}-service`,
+    serviceAppFactoryName: `create${pascalName}App`,
+    serviceProceduresFactoryName: `create${pascalName}Procedures`
+  };
+}
+function buildFullstackTemplateContext(projectName, frontendsInput, moduleConfigs, useCatalogProtocol = false) {
   const selectedFrontends = [...new Set(frontendsInput.length > 0 ? frontendsInput : DEFAULT_FULLSTACK_FRONTENDS)];
   const portsConfig = moduleConfigs?.fullstack?.ports ?? {};
   const portFor = (target) => portsConfig[target] ?? FRONTEND_PORTS_DEFAULT[target];
@@ -273,9 +611,11 @@ function buildFullstackTemplateContext(projectName, frontendsInput, moduleConfig
   }));
   return {
     versions: VERSIONS,
+    packageSpecifiers: buildFullstackPackageSpecifiers(useCatalogProtocol),
     contractPackageName: `${projectName}-contract`,
     contractExportName: `${toIdentifier(projectName)}Contract`,
     servPackageName: `${projectName}-serv`,
+    nativeAppIdSegment: toIdentifier(projectName).toLowerCase(),
     sharedPackageName: `${projectName}-shared`,
     selectedFrontends,
     selectedFrontendsJson: `[${selectedFrontends.map((f) => `'${f}'`).join(", ")}]`,
@@ -330,9 +670,14 @@ function toIdentifier(value) {
     return "app";
   return IDENTIFIER_START_REGEX.test(camel) ? camel : `app${camel}`;
 }
+function toPascalIdentifier(value) {
+  if (!value)
+    return "App";
+  return `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
+}
 async function generateFromTemplates(projectPath, context) {
   const root = getTemplatesRoot();
-  const includeBaseTemplate = context.appType !== "fullstack";
+  const includeBaseTemplate = context.appType !== "fullstack" && !context.isApiWorkspace;
   if (includeBaseTemplate) {
     await copyStaticDir(path2.join(root, "base"), projectPath);
   }
@@ -341,32 +686,37 @@ async function generateFromTemplates(projectPath, context) {
     const appExcludes = context.hasI18n ? [] : ["messages"];
     await copyStaticDir(appDir, projectPath, appExcludes);
   }
-  for (const featureId of Object.keys(context.features)) {
-    if (!context.features[featureId]) {
-      continue;
-    }
-    if (!FEATURE_ID_REGEX.test(featureId)) {
-      continue;
-    }
-    const featureDir = path2.join(root, "features", featureId);
-    if (!await fse.pathExists(featureDir)) {
-      continue;
-    }
-    const sharedDirs = FEATURE_ROUTE_DIRS[featureId] || [];
-    for (const dirName of sharedDirs) {
-      if (context.isCapacitorApp && dirName === "routes-shared") {
+  if (!context.isApiWorkspace) {
+    for (const featureId of Object.keys(context.features)) {
+      if (context.isSvelteOnlyApp) {
         continue;
       }
-      const routesSrc = path2.join(featureDir, dirName);
-      if (await fse.pathExists(routesSrc)) {
-        await copyStaticDir(routesSrc, path2.join(projectPath, "src", "routes"));
+      if (!context.features[featureId]) {
+        continue;
       }
-    }
-    const appSpecificTypes = FEATURE_APP_ROUTE_DIRS[featureId] || [];
-    if (appSpecificTypes.includes(context.appType)) {
-      const appRouteSrc = path2.join(featureDir, `routes-${context.appType}`);
-      if (await fse.pathExists(appRouteSrc)) {
-        await copyStaticDir(appRouteSrc, path2.join(projectPath, "src", "routes"));
+      if (!FEATURE_ID_REGEX.test(featureId)) {
+        continue;
+      }
+      const featureDir = path2.join(root, "features", featureId);
+      if (!await fse.pathExists(featureDir)) {
+        continue;
+      }
+      const sharedDirs = FEATURE_ROUTE_DIRS[featureId] || [];
+      for (const dirName of sharedDirs) {
+        if (context.isCapacitorApp && dirName === "routes-shared") {
+          continue;
+        }
+        const routesSrc = path2.join(featureDir, dirName);
+        if (await fse.pathExists(routesSrc)) {
+          await copyStaticDir(routesSrc, path2.join(projectPath, "src", "routes"));
+        }
+      }
+      const appSpecificTypes = FEATURE_APP_ROUTE_DIRS[featureId] || [];
+      if (appSpecificTypes.includes(context.appType)) {
+        const appRouteSrc = path2.join(featureDir, `routes-${context.appType}`);
+        if (await fse.pathExists(appRouteSrc)) {
+          await copyStaticDir(appRouteSrc, path2.join(projectPath, "src", "routes"));
+        }
       }
     }
   }
@@ -382,15 +732,22 @@ async function generateFromTemplates(projectPath, context) {
   }
 }
 async function renderDynamicFiles(templatesRoot, projectPath, context) {
-  const rootDirs = context.appType === "fullstack" ? [path2.join(templatesRoot, "apps", context.appType)] : [
+  const rootDirs = context.appType === "fullstack" || context.isApiWorkspace ? [path2.join(templatesRoot, "apps", context.appType)] : [
     path2.join(templatesRoot, "base"),
     path2.join(templatesRoot, "apps", context.appType)
   ];
   for (const dir of rootDirs) {
     await renderHbsInDir(dir, projectPath, context);
+    await copyRenderedStaticPathFiles(dir, projectPath, context);
+  }
+  if (context.isApiWorkspace) {
+    return;
   }
   const routesDest = path2.join(projectPath, "src", "routes");
   for (const featureId of Object.keys(context.features)) {
+    if (context.isSvelteOnlyApp) {
+      continue;
+    }
     if (!context.features[featureId]) {
       continue;
     }
@@ -439,6 +796,34 @@ async function renderHbsInDir(dir, destRoot, context) {
     await fse.writeFile(destPath, normalizedRendered, "utf-8");
   }
 }
+async function copyRenderedStaticPathFiles(dir, destRoot, context) {
+  const staticFiles = await findRenderedStaticPathFiles(dir);
+  for (const relPath of staticFiles) {
+    if (!shouldCopyRenderedStaticPathFile(relPath, context)) {
+      continue;
+    }
+    const outRelPath = renderOutputPath(relPath, context);
+    if (!isSafeRelativePath(outRelPath)) {
+      continue;
+    }
+    const srcPath = path2.join(dir, relPath);
+    const destPath = path2.join(destRoot, outRelPath);
+    await fse.ensureDir(path2.dirname(destPath));
+    await fse.copyFile(srcPath, destPath);
+  }
+}
+function shouldCopyRenderedStaticPathFile(relPath, context) {
+  if (context.appType !== "fullstack" || !context.fullstack) {
+    return true;
+  }
+  const normalizedPath = relPath.split(path2.sep).join("/");
+  const frontendMatch = FULLSTACK_FRONTEND_TEMPLATE_PATH_REGEX.exec(normalizedPath);
+  if (!frontendMatch) {
+    return true;
+  }
+  const target = frontendMatch[1];
+  return Boolean(context.fullstack.frontends[target]);
+}
 function normalizeRenderedContent(content, outRelPath) {
   const normalizedLineEndings = content.replace(/\r\n/g, "\n");
   const ext = path2.extname(outRelPath);
@@ -482,13 +867,13 @@ var APP_TYPES = {
   },
   "api": {
     name: "API \u670D\u52A1",
-    description: "\u7EAF API \u540E\u7AEF\u670D\u52A1\uFF0CRESTful \u8DEF\u7531\u3001\u65E0 UI",
+    description: "typed API workspace\uFF0C\u542B contract + service \u53CC\u5DE5\u7A0B\u3001\u65E0 UI",
     defaultFeatures: ["db", "cache"]
   },
-  "android-app": {
-    name: "Android \u5E94\u7528",
-    description: "Android \u539F\u751F\u5E94\u7528\uFF08Capacitor + SvelteKit SPA\uFF09\uFF0C\u53EF\u6253\u5305\u4E3A APK",
-    defaultFeatures: ["iam", "db", "cache", "crypto", "api-client", "capacitor"]
+  "mobile-app": {
+    name: "\u79FB\u52A8\u5E94\u7528",
+    description: "\u79FB\u52A8\u7AEF\u5E94\u7528\uFF08Capacitor + Svelte 5 + Vite\uFF09\uFF0C\u53EF\u6253\u5305\u4E3A Android/iOS",
+    defaultFeatures: ["api-client", "capacitor"]
   },
   "fullstack": {
     name: "\u524D\u540E\u7AEF\u5206\u79BB\u5DE5\u7A0B",
@@ -498,9 +883,9 @@ var APP_TYPES = {
 };
 var FRONTEND_TARGETS = {
   web: { name: "Web", description: "\u6D4F\u89C8\u5668 Web \u5E94\u7528", implemented: true },
-  app: { name: "App", description: "\u79FB\u52A8\u7AEF H5/App \u524D\u7AEF", implemented: true },
+  app: { name: "App", description: "\u79FB\u52A8\u7AEF Capacitor App / H5 \u524D\u7AEF", implemented: true },
   miniapp: { name: "\u5C0F\u7A0B\u5E8F", description: "\u9884\u7559\u76EE\u6807\uFF0C\u5F53\u524D\u53EA\u751F\u6210\u8BF4\u660E\u5360\u4F4D", implemented: false },
-  desktop: { name: "\u684C\u9762\u7AEF", description: "\u684C\u9762\u7AEF\u524D\u7AEF\u5DE5\u7A0B\uFF08Tauri \u9884\u7559\uFF09", implemented: true }
+  desktop: { name: "\u684C\u9762\u7AEF", description: "Tauri \u684C\u9762\u7AEF\u524D\u7AEF\u5DE5\u7A0B", implemented: true }
 };
 var DEFAULT_FULLSTACK_FRONTENDS2 = ["web", "app", "desktop"];
 var FEATURES = {
@@ -691,29 +1076,36 @@ async function createProject(options) {
     });
     await generateFromTemplates(projectPath, context);
     if (resolvedOptions.appType !== "fullstack") {
-      const { generateConfigFile: generateConfigFile2 } = await import('./cli-config-templates-IGGO7P45.js');
+      const { generateConfigFile: generateConfigFile2, generateEnvExample } = await import('./cli-config-templates-5J5VKWWD.js');
       const configs = resolvedOptions.moduleConfigs;
+      const isApiWorkspace = resolvedOptions.appType === "api";
+      const configDir = isApiWorkspace ? path2.join(projectPath, "apps", `${resolvedOptions.name}-service`, "config") : path2.join(projectPath, "config");
+      const envExamplePath = isApiWorkspace ? path2.join(projectPath, "apps", `${resolvedOptions.name}-service`, ".env.example") : path2.join(projectPath, ".env.example");
       for (const featureId of resolvedOptions.features) {
         const configKey = getFeatureConfigKey(featureId);
         if (configKey) {
           const content = generateConfigFile2(configKey, configs);
-          await writeFile(path2.join(projectPath, "config", `_${configKey}.yml`), content);
+          await writeFile(path2.join(configDir, `_${configKey}.yml`), content);
         }
       }
-      await writeFile(
-        path2.join(projectPath, "config", "_core.yml"),
-        generateConfigFile2("core", configs)
-      );
-      const { generateEnvExample } = await import('./cli-config-templates-IGGO7P45.js');
-      await writeFile(
-        path2.join(projectPath, ".env.example"),
-        generateEnvExample(resolvedOptions.features, configs)
-      );
+      if (!isApiWorkspace) {
+        await writeFile(
+          path2.join(configDir, "_core.yml"),
+          generateConfigFile2("core", configs)
+        );
+      }
+      const envExample = isApiWorkspace ? `${generateEnvExample(resolvedOptions.features, configs)}
+# =============================================================================
+# Service Runtime
+# =============================================================================
+PORT=3000
+` : generateEnvExample(resolvedOptions.features, configs);
+      await writeFile(envExamplePath, envExample);
     }
-    const { generateSkillFiles } = await import('./cli-skill-templates-IMYZPQRG.js');
+    const { generateSkillFiles } = await import('./cli-skill-templates-JMSV2SVW.js');
     await generateSkillFiles(projectPath, resolvedOptions.features, resolvedOptions.appType);
     const appTypeLabel = APP_TYPES[resolvedOptions.appType].name;
-    const readmeContent = resolvedOptions.appType === "fullstack" ? generateFullstackReadme(resolvedOptions.name, resolvedOptions.packageManager, resolvedOptions.frontends) : generateReadme(resolvedOptions.name, appTypeLabel, resolvedOptions.packageManager);
+    const readmeContent = resolvedOptions.appType === "fullstack" ? generateFullstackReadme(resolvedOptions.name, resolvedOptions.packageManager, resolvedOptions.frontends) : resolvedOptions.appType === "api" ? generateApiWorkspaceReadme(resolvedOptions.name, resolvedOptions.packageManager) : generateReadme(resolvedOptions.name, appTypeLabel, resolvedOptions.packageManager);
     await writeFile(
       path2.join(projectPath, "README.md"),
       readmeContent
@@ -734,8 +1126,7 @@ async function createProject(options) {
     }
     if (resolvedOptions.install) {
       spinner.start(`\u5B89\u88C5\u4F9D\u8D56 (${resolvedOptions.packageManager})...`);
-      const installCmd = getInstallCommand(resolvedOptions.packageManager);
-      execSync(installCmd, { cwd: projectPath, stdio: "ignore" });
+      installDependencies(projectPath, resolvedOptions.packageManager);
       spinner.succeed();
     }
     printCompletionMessage(resolvedOptions);
@@ -855,7 +1246,7 @@ async function resolveOptions(options) {
     addExamples = examples;
   }
   const detected = await detectPackageManager(options.cwd ?? ".");
-  let packageManager = selectedAppType === "fullstack" ? "pnpm" : options.packageManager;
+  let packageManager = selectedAppType === "fullstack" || selectedAppType === "api" ? "pnpm" : options.packageManager;
   if (!packageManager && useDefaults) {
     packageManager = detected;
   }
@@ -1172,6 +1563,50 @@ function getInstallCommand(pm) {
 function getRunCommand(pm, script) {
   return pm === "npm" ? `npm run ${script}` : `${pm} ${script}`;
 }
+function installDependencies(projectPath, pm) {
+  const installCmd = getInstallCommand(pm);
+  try {
+    execSync(installCmd, {
+      cwd: projectPath,
+      stdio: "pipe",
+      encoding: "utf-8",
+      maxBuffer: 10 * 1024 * 1024
+    });
+  } catch (error) {
+    const details = formatCommandFailure(installCmd, error);
+    throw new Error(`\u5B89\u88C5\u4F9D\u8D56\u5931\u8D25\uFF08${pm}\uFF09\u3002
+${details}`);
+  }
+}
+function formatCommandFailure(command, error) {
+  if (!error || typeof error !== "object") {
+    return `\u547D\u4EE4: ${command}`;
+  }
+  const failure = error;
+  const stdout = normalizeChildOutput(failure.stdout);
+  const stderr = normalizeChildOutput(failure.stderr);
+  const status = typeof failure.status === "number" ? `\u9000\u51FA\u7801: ${failure.status}` : "";
+  const signal = typeof failure.signal === "string" ? `\u4FE1\u53F7: ${failure.signal}` : "";
+  const output = [
+    `\u547D\u4EE4: ${command}`,
+    status,
+    signal,
+    stderr ? `stderr:
+${stderr}` : "",
+    stdout ? `stdout:
+${stdout}` : ""
+  ].filter(Boolean);
+  return output.join("\n\n");
+}
+function normalizeChildOutput(output) {
+  if (typeof output === "string") {
+    return output.trim();
+  }
+  if (Buffer.isBuffer(output)) {
+    return output.toString("utf-8").trim();
+  }
+  return "";
+}
 function generateReadme(name, appTypeLabel, pm) {
   const install = getInstallCommand(pm);
   return `# ${name}
@@ -1196,10 +1631,50 @@ ${getRunCommand(pm, "preview")}
 ## \u6587\u6863
 
 - [hai Agent Framework](https://github.com/hai-series/hai-framework)
-- [SvelteKit](https://kit.svelte.dev/)
 - [Svelte 5](https://svelte.dev/)
 `;
 }
+function generateApiWorkspaceReadme(name, pm) {
+  return `# ${name}
+
+\u57FA\u4E8E hai Agent Framework \u6784\u5EFA\u7684 typed API workspace\u3002
+
+## \u5DE5\u7A0B\u7ED3\u6784
+
+- \`apps/${name}-contract\`\uFF1A\u5171\u4EAB API contract\u3001Zod schema \u4E0E\u7C7B\u578B
+- \`apps/${name}-service\`\uFF1A\u540E\u7AEF API service\uFF0C\u57FA\u4E8E \`@h-ai/serv\` \u66B4\u9732 HTTP \u5E94\u7528
+
+## \u5F00\u53D1
+
+\`\`\`bash
+${pm} install
+${pm} dev
+\`\`\`
+
+## \u8D28\u91CF\u95E8\u7981
+
+\`\`\`bash
+${pm} typecheck
+${pm} lint
+${pm} build
+${pm} test
+${pm} test:e2e
+\`\`\`
+
+## \u6269\u5C55\u5EFA\u8BAE
+
+- \u5728 \`${name}-contract\` \u4E2D\u7EF4\u62A4\u5E94\u7528\u7EA7 contract\uFF0C\u524D\u540E\u7AEF\u5171\u7528\u540C\u4E00\u4EFD\u7C7B\u578B\u4E0E\u8DEF\u5F84\u5B9A\u4E49\u3002
+- \u5728 \`${name}-service\` \u4E2D\u6269\u5C55 procedures\u3001\u6A21\u5757\u521D\u59CB\u5316\u4E0E\u914D\u7F6E\u3002
+- \u9700\u8981 IAM / storage / ai \u65F6\uFF0C\u4F18\u5148\u590D\u7528 \`@h-ai/api-contract\` \u4E0E \`@h-ai/serv/features/*\`\u3002
+
+## \u6587\u6863
+
+- [hai Agent Framework](https://github.com/hai-series/hai-framework)
+- [@h-ai/serv](./.agents/skills/hai-serv/SKILL.md)
+- [@h-ai/api-contract](./.agents/skills/hai-api-contract/SKILL.md)
+- [@h-ai/api-client](./.agents/skills/hai-api-client/SKILL.md)
+`;
+}
 function generateFullstackReadme(name, pm, frontends) {
   const enabledFrontends = frontends.map((target) => FRONTEND_TARGETS[target].name).join(" / ");
   return `# ${name}
@@ -1218,13 +1693,28 @@ function generateFullstackReadme(name, pm, frontends) {
 
 \u5DF2\u542F\u7528\u524D\u7AEF\uFF1A${enabledFrontends || "Web / App / Desktop"}
 
-## \u5F00\u53D1
+## \u5F00\u53D1\u3001\u7F16\u8BD1\u4E0E\u6253\u5305
 
 \`\`\`bash
 ${pm} install
 ${pm} dev
+
+# \u4E00\u952E\u7F16\u8BD1\uFF1A\u7C7B\u578B\u68C0\u67E5 + \u5168\u5DE5\u4F5C\u533A\u6784\u5EFA
+${pm} compile
+
+# \u4E00\u952E\u6253\u5305\uFF1AWeb build\u3001App Capacitor sync\u3001Desktop Tauri build\uFF08\u6309\u542F\u7528\u524D\u7AEF\u6267\u884C\uFF09
+${pm} package
+
+# \u90E8\u7F72\u5165\u53E3\uFF1A\u9ED8\u8BA4\u6267\u884C package\uFF0C\u53EF\u66FF\u6362\u4E3A\u56E2\u961F\u81EA\u5DF1\u7684 CI/CD \u53D1\u5E03\u811A\u672C
+${pm} deploy
 \`\`\`
 
+\u524D\u7AEF\u5355\u72EC\u4EA4\u4ED8\u547D\u4EE4\uFF1A
+
+- Web\uFF1A\`${pm} --filter ${name}-web build\` / \`${pm} --filter ${name}-web package\`
+- App\uFF1A\`${pm} --filter ${name}-app package\`\uFF0CAndroid/iOS \u53EF\u7528 \`cap:build:android:debug\` / \`cap:build:android:release\` / \`cap:build:ios\`
+- Desktop\uFF1A\`${pm} --filter ${name}-desktop tauri:dev\` / \`${pm} --filter ${name}-desktop package\`
+
 ## i18n \u4E0E shared \u534F\u540C
 
 - shared\uFF1A\`packages/${name}-shared/project.inlang\` + \`messages/\`\uFF0C\u53EA\u653E\u8DE8\u7AEF\u5171\u4EAB\u7EC4\u4EF6\u6587\u6848\u3002
@@ -1251,7 +1741,6 @@ ${pm} test:e2e
 ## \u6587\u6863
 
 - [hai Agent Framework](https://github.com/hai-series/hai-framework)
-- [SvelteKit](https://kit.svelte.dev/)
 - [@h-ai/serv](./.agents/skills/hai-serv/SKILL.md)
 - [@h-ai/ui](./.agents/skills/hai-ui/SKILL.md)
 `;
@@ -1275,7 +1764,8 @@ function printCompletionMessage(options) {
   if (!options.install) {
     core.logger.info(chalk.cyan(`  ${getInstallCommand(options.packageManager)}`));
   }
-  if (options.appType === "fullstack") {
+  if (options.appType === "fullstack" || options.appType === "api") {
+    core.logger.info(chalk.cyan(`  ${getRunCommand(options.packageManager, "dev")}`));
     core.logger.info(chalk.cyan(`  ${getRunCommand(options.packageManager, "typecheck")}`));
     core.logger.info(chalk.cyan(`  ${getRunCommand(options.packageManager, "test")}`));
     core.logger.info(chalk.cyan(`  ${getRunCommand(options.packageManager, "test:e2e")}`));
@@ -1364,7 +1854,7 @@ async function addModule(options) {
       core.logger.info(`\u53EF\u7528\u6A21\u5757: ${Object.keys(MODULE_MAP).join(", ")}`);
       return;
     }
-    const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-IMYZPQRG.js');
+    const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-JMSV2SVW.js');
     if (moduleDef.packages.every((p) => project.haiPackages.includes(p))) {
       const generatedFiles2 = await generateProjectAiSupport(
         cwd,
@@ -1400,7 +1890,8 @@ async function addModule(options) {
     const pkg = await fse.readJson(pkgPath);
     if (!pkg.dependencies)
       pkg.dependencies = {};
-    const depVersion = `^${getCliVersion()}`;
+    const existingHaiSpecifier = Object.entries(pkg.dependencies).find(([pkgName]) => pkgName.startsWith("@h-ai/"))?.[1];
+    const depVersion = existingHaiSpecifier === "catalog:" ? "catalog:" : `^${getCliVersion()}`;
     for (const pkgName of allPackages) {
       if (!pkg.dependencies[pkgName]) {
         pkg.dependencies[pkgName] = depVersion;
@@ -1846,6 +2337,7 @@ export const down: MigrationFn = async (db) => {
 }
 var MODULE_CONFIG_MAP = {
   "@h-ai/core": { configKey: "core", label: "Core" },
+  "@h-ai/serv": { configKey: "serv", label: "Service" },
   "@h-ai/reldb": { configKey: "db", label: "Database" },
   "@h-ai/cache": { configKey: "cache", label: "Cache" },
   "@h-ai/iam": { configKey: "iam", label: "IAM" },
@@ -1965,7 +2457,7 @@ var VERSION = getCliVersion();
 var cli = cac("hai");
 cli.option("-v, --verbose", "\u663E\u793A\u8BE6\u7EC6\u8F93\u51FA");
 cli.option("-C, --cwd <path>", "\u5DE5\u4F5C\u76EE\u5F55");
-cli.command("create [name]", "\u521B\u5EFA\u65B0\u7684 hai \u9879\u76EE").option("--type <type>", "\u5E94\u7528\u7C7B\u578B (admin, website, h5, api, android-app, fullstack)").option("--frontends <targets>", "\u524D\u540E\u7AEF\u5206\u79BB\u5DE5\u7A0B\u524D\u7AEF\u76EE\u6807 (\u9017\u53F7\u5206\u9694: web,app,miniapp,desktop)").option("-t, --template <template>", "\u9879\u76EE\u6A21\u677F (minimal, default, full, custom)").option("-f, --features <features>", "\u529F\u80FD\u5217\u8868 (\u9017\u53F7\u5206\u9694: iam,db,cache,ai,storage,crypto)").option("--examples", "\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-examples", "\u4E0D\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-install", "\u4E0D\u5B89\u88C5\u4F9D\u8D56").option("-p, --package-manager <pm>", "\u5305\u7BA1\u7406\u5668 (pnpm, npm, yarn)").option("--no-git", "\u4E0D\u521D\u59CB\u5316 Git").option("--git-remote <url>", "Git \u8FDC\u7A0B\u4ED3\u5E93\u5730\u5740").option("-y, --yes", "\u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E\uFF0C\u8DF3\u8FC7\u4EA4\u4E92").action(async (name, options) => {
+cli.command("create [name]", "\u521B\u5EFA\u65B0\u7684 hai \u9879\u76EE").option("--type <type>", "\u5E94\u7528\u7C7B\u578B (admin, website, h5, api, mobile-app, fullstack)").option("--frontends <targets>", "\u524D\u540E\u7AEF\u5206\u79BB\u5DE5\u7A0B\u524D\u7AEF\u76EE\u6807 (\u9017\u53F7\u5206\u9694: web,app,miniapp,desktop)").option("-t, --template <template>", "\u9879\u76EE\u6A21\u677F (minimal, default, full, custom)").option("-f, --features <features>", "\u529F\u80FD\u5217\u8868 (\u9017\u53F7\u5206\u9694: iam,db,cache,ai,storage,crypto)").option("--examples", "\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-examples", "\u4E0D\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-install", "\u4E0D\u5B89\u88C5\u4F9D\u8D56").option("-p, --package-manager <pm>", "\u5305\u7BA1\u7406\u5668 (pnpm, npm, yarn)").option("--no-git", "\u4E0D\u521D\u59CB\u5316 Git").option("--git-remote <url>", "Git \u8FDC\u7A0B\u4ED3\u5E93\u5730\u5740").option("-y, --yes", "\u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E\uFF0C\u8DF3\u8FC7\u4EA4\u4E92").action(async (name, options) => {
   try {
     const features = typeof options.features === "string" ? options.features.split(",").map((f) => f.trim()) : void 0;
     const frontends = typeof options.frontends === "string" ? options.frontends.split(",").map((f) => f.trim()).filter(Boolean) : void 0;