@adep/cli 0.0.7 → 0.0.9

package/README.md

@@ -133,23 +133,37 @@ adep init --list -s https://platform.example.com
 
 ```
 my-app/
-├── adep.config.ts      # 项目标识（dev / deploy 按此识别）
-├── tsconfig.json       # 云函数 TypeScript 编辑器配置（strict + noEmit）
-├── adep.d.ts           # 云函数上下文环境类型声明（ctx: AdepContext 补全）
+├── package.json         # 应用定义：声明 @adep/cli 版本依赖 + scripts（dev/serve/deploy/web:*/doctor）+ engines
+├── adep.config.ts       # 项目配置：name / template / functionsDir / functions_prefix
+├── tsconfig.json        # 云函数 TypeScript 编辑器配置（strict + noEmit）
+├── adep.d.ts            # 云函数上下文环境类型声明（ctx: AdepContext 补全）
 ├── functions/
-│   ├── hello.ts        # 示例函数（deploy 后经 /hello 触发）
+│   ├── hello.ts         # 示例函数（deploy 后经 /hello 触发）
 │   └── README.md
-├── web/                # 前端工程（标准 Vite + Vue 3，与 Web IDE 项目同构）
+├── web/                 # 前端工程（标准 Vite + Vue 3，与 Web IDE 项目同构）
 │   ├── index.html
 │   ├── package.json
 │   ├── vite.config.ts
 │   └── src/{main.ts, App.vue}
 ├── database/
-│   └── schema.sql      # 数据库结构（占位；表由平台控制台 / adep db 管理）
+│   └── schema.sql       # 数据库结构（占位；表由平台控制台 / adep db 管理）
 ├── README.md
-└── .gitignore          # 已忽略 node_modules/ data/ .adep/
+└── .gitignore           # 已忽略 node_modules/ data/ .adep/
 ```
 
+**根 package.json**：与导出的离线部署包（`adep export` / 平台自托管导出）的应用定义同构——
+声明 `@adep/cli` 版本依赖（值来自 CLI 自身发布版本，不硬编码）与常用 scripts：
+`pnpm dev`（= `adep dev`）/ `pnpm serve` / `pnpm deploy` / `pnpm web:dev` / `pnpm web:build` / `pnpm doctor`。
+
+**functions_prefix（本地函数路由前缀）**：`adep.config.ts` 的 `functions_prefix` 控制本地
+调试路由前缀（默认空）：
+
+- 配置 `functions_prefix: 'api'` 后：`adep dev` 访问路径 `/{fnName}` → `/api/{fnName}`；
+  `adep serve` 为 `/api/{fnName}` → `/api/api/{fnName}`（前缀拼接在 `/api/` 之后）。
+- 留空：`adep dev` 为 `/{fnName}`，`adep serve` 为 `/api/{fnName}`。
+- **边界**：只影响本地 HTTP 入口路由；函数互调 `ctx.cloud.invoke('name')` 与线上部署路径
+  按函数名，不随前缀变化（与线上同构）。
+
 **web/ 前端工程**：与 Web IDE 内创建的项目完全同构（同一份模板真相源），可无缝在两端切换开发；
 本地跑前端：`cd web && npm install && npm run dev`，部署由 `adep deploy` 统一构建发布。
 
@@ -384,16 +398,23 @@ export ADEP_HOME=~/.adep
 
 ### `adep.config.ts`
 
-`adep init` 生成的项目标识文件，CLI 的 `dev` / `deploy` 按此识别项目（CLI 直接 import 后读 `default` 的字段，无需任何辅助包）：
+`adep init` 生成的项目配置文件，CLI 的 `dev` / `serve` / `deploy` 按此识别项目（CLI 直接 import 后读 `default` 的字段，无需任何辅助包）：
 
 ```ts
-// adep 项目配置：CLI（dev / deploy）按 default export 读取（name / functionsDir）。
+// adep 项目配置：CLI（dev / serve / deploy）按 default export 读取。
 export default {
   name: 'my-app', // 项目名（deploy 的默认 slug）
   template: 'fullstack', // 模板：empty | function | fullstack
+  functionsDir: 'functions', // 云函数目录
+  functions_prefix: '', // 本地调试路由前缀（dev: /{prefix}/{fn}，serve: /api/{prefix}/{fn}；留空保持默认）
 }
 ```
 
+- `functionsDir`：云函数目录（`dev` / `serve` / `deploy` 读取，缺省 `functions/`）。
+- `functions_prefix`：**仅影响本地调试路由**（见上方 `adep init` 产物结构说明）——
+  配置后 `adep dev` 访问路径变为 `/{prefix}/{fnName}`、`adep serve` 变为 `/api/{prefix}/{fnName}`；
+  函数互调与线上部署路径不随前缀变化。
+
 ---
 
 ## 常用示例

package/dist/index.js

@@ -2744,6 +2744,7 @@ var dev_exports = {};
 __export(dev_exports, {
   loadConfig: () => loadConfig,
   parseEnvFile: () => parseEnvFile,
+  resolveRouteFnName: () => resolveRouteFnName,
   startDevServer: () => startDevServer
 });
 import { createServer } from "node:http";
@@ -2756,18 +2757,19 @@ async function loadConfig(cwd) {
   try {
     await stat4(configPath);
   } catch {
-    return { name, functionsDir: "functions" };
+    return { name, functionsDir: "functions", functionsPrefix: "" };
   }
   const bun = globalThis.Bun;
-  if (bun === void 0) return { name, functionsDir: "functions" };
+  if (bun === void 0) return { name, functionsDir: "functions", functionsPrefix: "" };
   try {
     const mod = await import(configPath);
     return {
       name: mod.default?.name ?? name,
-      functionsDir: mod.default?.functionsDir ?? "functions"
+      functionsDir: mod.default?.functionsDir ?? "functions",
+      functionsPrefix: mod.default?.functions_prefix ?? ""
     };
   } catch {
-    return { name, functionsDir: "functions" };
+    return { name, functionsDir: "functions", functionsPrefix: "" };
   }
 }
 function parseEnvFile(content) {
@@ -2824,6 +2826,32 @@ function bodyOf(req) {
     req.on("error", rejectBody);
   });
 }
+function resolveRouteFnName(pathname, prefix) {
+  const segments = pathname.split("/").filter((segment) => segment.length > 0);
+  const normalizedPrefix = prefix.replace(/^\/+|\/+$/g, "");
+  if (normalizedPrefix.length === 0) {
+    const first = segments[0];
+    return first === void 0 ? {} : { fnName: first };
+  }
+  if (segments[0] !== normalizedPrefix) {
+    return {
+      error: {
+        code: "FN_PREFIX_REQUIRED",
+        message: `\u5DF2\u914D\u7F6E functions_prefix "${normalizedPrefix}"\uFF1A\u4EE5 /${normalizedPrefix}/{fnName} \u8C03\u7528\u672C\u5730\u51FD\u6570`
+      }
+    };
+  }
+  const second = segments[1];
+  if (second === void 0) {
+    return {
+      error: {
+        code: "FN_NAME_REQUIRED",
+        message: `\u4EE5 /${normalizedPrefix}/{fnName} \u8C03\u7528\u672C\u5730\u51FD\u6570`
+      }
+    };
+  }
+  return { fnName: second };
+}
 function writeJson(res, status, payload) {
   res.writeHead(status, { "content-type": "application/json" });
   res.end(JSON.stringify(payload));
@@ -2920,7 +2948,11 @@ async function startDevServer(options) {
   };
   const handle = async (req, res) => {
     const url = new URL(req.url ?? "/", "http://127.0.0.1");
-    const fnName = url.pathname.split("/").find((segment) => segment.length > 0);
+    const { fnName, error: routeError } = resolveRouteFnName(url.pathname, config.functionsPrefix);
+    if (routeError !== void 0) {
+      writeJson(res, 400, { error: routeError });
+      return;
+    }
     if (fnName === void 0) {
       writeJson(res, 400, {
         error: { code: "FN_NAME_REQUIRED", message: "\u4EE5 /{fnName} \u8C03\u7528\u672C\u5730\u51FD\u6570" }
@@ -3023,9 +3055,8 @@ function renderBanner(options) {
   lines.push("");
   lines.push("  \u80FD\u529B:");
   if (functions.length > 0) {
-    lines.push(
-      `    - \u51FD\u6570\u8DEF\u7531: ${baseUrl}/api/{fn}\uFF08${functions.length} \u4E2A\u51FD\u6570: ${functions.join(", ")}\uFF09`
-    );
+    const route = options.functionsPrefix === void 0 || options.functionsPrefix.length === 0 ? `${baseUrl}/api/{fn}` : `${baseUrl}/api/${options.functionsPrefix.replace(/^\/+|\/+$/g, "")}/{fn}`;
+    lines.push(`    - \u51FD\u6570\u8DEF\u7531: ${route}\uFF08${functions.length} \u4E2A\u51FD\u6570: ${functions.join(", ")}\uFF09`);
   } else {
     lines.push("    - \u51FD\u6570\u8DEF\u7531: \u65E0\uFF08functions/ \u76EE\u5F55\u4E3A\u7A7A\uFF09");
   }
@@ -3273,7 +3304,12 @@ async function startServeServer(options) {
     const url = new URL(req.url ?? "/", `http://${host}:${port}`);
     const pathname = url.pathname;
     if (pathname === "/api" || pathname.startsWith("/api/")) {
-      const fnName = pathname === "/api" ? "" : pathname.slice("/api/".length).split("/")[0];
+      const rest = pathname === "/api" ? "" : pathname.slice("/api/".length);
+      const { fnName, error: routeError } = resolveRouteFnName(rest, config.functionsPrefix);
+      if (routeError !== void 0) {
+        writeJson2(res, 400, { error: routeError });
+        return;
+      }
       if (fnName === void 0 || fnName.length === 0) {
         writeJson2(res, 400, {
           error: { code: "FN_NAME_REQUIRED", message: "\u4EE5 /api/{fnName} \u8C03\u7528\u51FD\u6570" }
@@ -3368,6 +3404,7 @@ async function startServeServer(options) {
     port: actualPort,
     projectName: config.name,
     functions: functionNames,
+    functionsPrefix: config.functionsPrefix,
     hasStatic,
     staticDir: relative(cwd, staticDir).length > 0 ? relative(cwd, staticDir) : staticDir
   });
@@ -5011,13 +5048,14 @@ ${detail}`);
 // packages/cli/src/cli.ts
 init_config();
 import { Command } from "commander";
-import { createRequire } from "node:module";
+import { createRequire as createRequire2 } from "node:module";
 
 // packages/cli/src/output.ts
 init_auth();
 
 // packages/cli/src/init.ts
 import { mkdir as mkdir2, stat as stat2, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { dirname as dirname2, join, resolve } from "node:path";
 
 // shared/sdk/adep-env.ts
@@ -5408,31 +5446,80 @@ var InitError = class extends Error {
     this.name = "InitError";
   }
 };
-var ADEP_CONFIG = (name, template) => `// adep \u9879\u76EE\u914D\u7F6E\uFF1ACLI\uFF08dev / deploy\uFF09\u6309 default export \u8BFB\u53D6\uFF08name / functionsDir\uFF09\u3002
+var requireJson = createRequire(import.meta.url);
+var CLI_VERSION = requireJson("../package.json").version;
+var ADEP_CONFIG = (name, template) => `// adep \u9879\u76EE\u914D\u7F6E\uFF1ACLI\uFF08dev / serve / deploy\uFF09\u6309 default export \u8BFB\u53D6\u3002
+// - name\uFF1A\u9879\u76EE\u6807\u8BC6\uFF08deploy / db \u7B49\u547D\u4EE4\u7684\u7F3A\u7701 project slug\uFF09
+// - template\uFF1A\u811A\u624B\u67B6\u6A21\u677F\uFF08empty / function / fullstack\uFF0Cinit \u65F6\u786E\u5B9A\uFF09
+// - functionsDir\uFF1A\u4E91\u51FD\u6570\u76EE\u5F55\uFF08dev / serve / deploy \u8BFB\u53D6\uFF0C\u7F3A\u7701 functions/\uFF09
+// - functions_prefix\uFF1A\u672C\u5730\u8C03\u8BD5\u8DEF\u7531\u524D\u7F00\u3002\u914D\u7F6E\u540E dev \u8BBF\u95EE\u8DEF\u5F84\u4E3A /{prefix}/{fnName}\u3001
+//   serve \u4E3A /api/{prefix}/{fnName}\uFF1B\u7559\u7A7A\u5219\u4FDD\u6301 /{fnName} \u4E0E /api/{fnName}\u3002
+//   \u8FB9\u754C\uFF1A\u53EA\u5F71\u54CD\u672C\u5730 HTTP \u5165\u53E3\u8DEF\u7531\uFF1B\u51FD\u6570\u4E92\u8C03\uFF08ctx.cloud.invoke\uFF09\u4E0E\u7EBF\u4E0A\u90E8\u7F72\u8DEF\u5F84\u6309\u51FD\u6570\u540D\uFF0C\u4E0D\u53D7\u5F71\u54CD\u3002
 export default {
   name: '${name}',
   template: '${template}',
+  functionsDir: 'functions',
+  functions_prefix: '',
 }
 `;
+var PACKAGE_JSON = (name, template) => {
+  const pkg = {
+    name,
+    version: "0.1.0",
+    private: true,
+    type: "module",
+    description: `AgentDeploy \u5168\u6808\u9879\u76EE\uFF08\u6A21\u677F\uFF1A${template}\uFF09\u2014\u2014functions/ \u4E91\u51FD\u6570 + web/ \u524D\u7AEF\u5DE5\u7A0B + database/ \u6570\u636E\u5E93`,
+    scripts: {
+      dev: "adep dev",
+      serve: "adep serve",
+      deploy: "adep deploy",
+      "web:dev": "cd web && npm install && npm run dev",
+      "web:build": "cd web && npm install && npm run build",
+      doctor: "adep doctor"
+    },
+    dependencies: {
+      "@adep/cli": CLI_VERSION
+    },
+    engines: {
+      node: ">=18",
+      bun: ">=1.0"
+    }
+  };
+  return `${JSON.stringify(pkg, null, 2)}
+`;
+};
 var README = (name, template) => `# ${name}
 
 AgentDeploy \u5168\u6808\u9879\u76EE\uFF08\u6A21\u677F\uFF1A${template}\uFF09\u3002
 
 ## \u5E38\u7528\u547D\u4EE4
 
-- \`adep dev\`\uFF1A\u672C\u5730\u8C03\u8BD5\uFF08\u76D1\u542C functions/\uFF0C\u652F\u6301\u70ED\u91CD\u8F7D\uFF0C\u9ED8\u8BA4 http://127.0.0.1:8787/<fnName>\uFF09
-- \`adep deploy\`\uFF1A\u589E\u91CF\u90E8\u7F72\uFF08\u5BF9\u6BD4\u8FDC\u7AEF\u54C8\u5E0C \u2192 \u4EC5\u4E0A\u4F20\u53D8\u66F4 \u2192 \u53D1\u5E03 \u2192 \u8F93\u51FA\u8BBF\u95EE\u57DF\u540D\uFF09
-- \`adep serve\`\uFF1A\u5F00\u53D1\u6001\u670D\u52A1\u5668\uFF08\u51FD\u6570 /api/{fn} + /healthz + \u9759\u6001\u6258\u7BA1 + \u524D\u7AEF\u9884\u89C8\uFF09
+- \`pnpm dev\`\uFF08= \`adep dev\`\uFF09\uFF1A\u672C\u5730\u8C03\u8BD5\uFF08\u76D1\u542C functions/\uFF0C\u652F\u6301\u70ED\u91CD\u8F7D\uFF0C\u9ED8\u8BA4 http://127.0.0.1:8787/<fnName>\uFF09
+- \`pnpm serve\`\uFF08= \`adep serve\`\uFF09\uFF1A\u5F00\u53D1\u6001\u670D\u52A1\u5668\uFF08\u51FD\u6570 /api/{fn} + /healthz + \u9759\u6001\u6258\u7BA1 + \u524D\u7AEF\u9884\u89C8\uFF09
+- \`pnpm deploy\`\uFF08= \`adep deploy\`\uFF09\uFF1A\u589E\u91CF\u90E8\u7F72\uFF08\u5BF9\u6BD4\u8FDC\u7AEF\u54C8\u5E0C \u2192 \u4EC5\u4E0A\u4F20\u53D8\u66F4 \u2192 \u53D1\u5E03 \u2192 \u8F93\u51FA\u8BBF\u95EE\u57DF\u540D\uFF09
+- \`pnpm web:dev\`\uFF1A\u524D\u7AEF\u5DE5\u7A0B\u672C\u5730\u5F00\u53D1\uFF08cd web && vite\uFF09
+- \`pnpm web:build\`\uFF1A\u524D\u7AEF\u5DE5\u7A0B\u6784\u5EFA
+- \`pnpm doctor\`\uFF08= \`adep doctor\`\uFF09\uFF1A\u672C\u5730\u73AF\u5883\u79BB\u7EBF\u8BCA\u65AD
 
 ## \u76EE\u5F55\u7ED3\u6784
 
-- \`adep.config.ts\`\uFF1A\u9879\u76EE\u6807\u8BC6\uFF08dev / deploy \u6309\u6B64\u8BC6\u522B\uFF09
+- \`package.json\`\uFF1A\u5E94\u7528\u5B9A\u4E49\uFF08\u58F0\u660E @adep/cli \u7248\u672C\u4F9D\u8D56\u4E0E\u5E38\u7528 scripts\uFF1B\u4E0E\u5BFC\u51FA\u7684\u79BB\u7EBF\u90E8\u7F72\u5305\u540C\u6784\uFF09
+- \`adep.config.ts\`\uFF1A\u9879\u76EE\u914D\u7F6E\uFF08name / template / functionsDir / functions_prefix\uFF09
 - \`functions/\`\uFF1A\u4E91\u51FD\u6570\u76EE\u5F55\uFF08\u6BCF\u4E2A\u6587\u4EF6 = \u4E00\u4E2A\u51FD\u6570\uFF0C\u9ED8\u8BA4\u5BFC\u51FA \`(ctx: AdepContext) => Response\`\uFF09
 - \`web/\`\uFF1A\u524D\u7AEF\u5DE5\u7A0B\uFF08\u6807\u51C6 Vite + Vue 3\uFF1B\u4E0E Web IDE \u9879\u76EE\u540C\u6784\uFF0C\u53EF\u6574\u76EE\u5F55\u5BFC\u51FA\u4E8C\u6B21\u5F00\u53D1\uFF09
 - \`database/schema.sql\`\uFF1A\u6570\u636E\u5E93\u7ED3\u6784\uFF08\u8868\u7531\u5E73\u53F0\u63A7\u5236\u53F0 / \`adep db\` \u7BA1\u7406\uFF0C\u6B64\u5904\u4E3A\u7ED3\u6784\u8BB0\u5F55\uFF09
 - \`tsconfig.json\`\uFF1A\u4E91\u51FD\u6570 TypeScript \u7F16\u8F91\u5668\u914D\u7F6E\uFF08strict + noEmit\uFF09
 - \`adep.d.ts\`\uFF1A\u4E91\u51FD\u6570\u4E0A\u4E0B\u6587\u73AF\u5883\u7C7B\u578B\u58F0\u660E\uFF08\`ctx: AdepContext\` \u8865\u5168\uFF0C\u65E0\u9700\u88C5\u4F9D\u8D56\uFF09
 
+## \u672C\u5730\u51FD\u6570\u8DEF\u7531\u524D\u7F00\uFF08functions_prefix\uFF09
+
+\`adep.config.ts\` \u7684 \`functions_prefix\` \u63A7\u5236\u672C\u5730\u8C03\u8BD5\u8DEF\u7531\u524D\u7F00\uFF08\u9ED8\u8BA4\u7A7A\uFF09\uFF1A
+- \u914D\u7F6E \`functions_prefix: 'api'\` \u540E\uFF1A\`adep dev\` \u8BBF\u95EE \`/{fnName}\` \u2192 \`/api/{fnName}\`\uFF1B
+  \`adep serve\` \u8BBF\u95EE \`/api/{fnName}\` \u2192 \`/api/api/{fnName}\`\uFF08\u524D\u7F00\u62FC\u63A5\uFF09\u3002
+- \u7559\u7A7A\uFF1A\`adep dev\` \u4E3A \`/{fnName}\`\uFF0C\`adep serve\` \u4E3A \`/api/{fnName}\`\u3002
+- **\u8FB9\u754C**\uFF1A\u53EA\u5F71\u54CD\u672C\u5730 HTTP \u5165\u53E3\uFF1B\u51FD\u6570\u4E92\u8C03 \`ctx.cloud.invoke('name')\` \u4E0E\u7EBF\u4E0A\u90E8\u7F72\u8DEF\u5F84\u6309\u51FD\u6570\u540D\uFF0C
+  \u4E0D\u968F\u524D\u7F00\u53D8\u5316\uFF08\u4E0E\u7EBF\u4E0A\u540C\u6784\uFF09\u3002
+
 ## \u4E91\u51FD\u6570\u7C7B\u578B\u63D0\u793A
 
 \u7528 VSCode \u6253\u5F00\u672C\u76EE\u5F55\uFF0C\u4EFB\u610F \`functions/**\` \u4E0B\u7684 TS \u6587\u4EF6\u5373\u53EF\u83B7\u5F97 \`AdepContext\` / \`ctx.cloud.*\` \u8865\u5168\uFF1A
@@ -5493,6 +5580,8 @@ async function initProject(cwd, name, template) {
     throw new InitError("DIR_EXISTS", `\u76EE\u5F55 ${projectPath} \u5DF2\u5B58\u5728\uFF1A\u8BF7\u6362\u4E00\u4E2A\u540D\u5B57\u6216\u5148\u5220\u9664`);
   }
   const files = [
+    // 根 package.json：应用定义（声明 @adep/cli 版本依赖与 scripts；与导出的离线部署包同构）。
+    { path: "package.json", content: PACKAGE_JSON(name, template) },
     { path: "adep.config.ts", content: ADEP_CONFIG(name, template) },
     // 云函数 TypeScript 类型提示：tsconfig 把 adep.d.ts 纳入 include，写 ctx: AdepContext 即有补全。
     { path: "tsconfig.json", content: ADEP_TSCONFIG_JSON },
@@ -6282,8 +6371,8 @@ function registerExport(program2, ctx) {
 }
 
 // packages/cli/src/cli.ts
-var requireJson = createRequire(import.meta.url);
-var APP_VERSION = requireJson("../package.json").version;
+var requireJson2 = createRequire2(import.meta.url);
+var APP_VERSION = requireJson2("../package.json").version;
 function buildProgram(options = {}) {
   const output = options.output ?? ((line) => process.stdout.write(`${line}
 `));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002",
   "bin": {