@lark-apaas/openclaw-dev-cli 0.1.3 → 0.1.5

package/README.md

@@ -0,0 +1,86 @@
+# @lark-apaas/openclaw-dev-cli
+
+OpenClaw 应用开发 CLI，管理应用的创建、关联和部署。
+
+## 安装
+
+无需安装，通过 npx 直接使用：
+
+```bash
+npx --yes @lark-apaas/openclaw-dev-cli <command> [options]
+```
+
+## 命令
+
+### init — 初始化应用
+
+```bash
+# 从模板创建新应用
+npx --yes @lark-apaas/openclaw-dev-cli init --template <html|nextjs-static|nextjs> --dir <path>
+
+# clone 后初始化
+npx --yes @lark-apaas/openclaw-dev-cli init --dir <path>
+```
+
+| 选项 | 说明 | 默认值 |
+|------|------|--------|
+| `--dir <path>` | 项目目录 | `.` |
+| `--template <template>` | 模板类型（无代码时必须） | - |
+| `--title <title>` | 应用名称 | 目录名 |
+| `--description <desc>` | 应用描述 | `""` |
+| `--template-version <version>` | 模板包版本 | `latest` |
+| `--skip-install` | 跳过依赖安装 | `false` |
+
+### link — 关联已有项目
+
+```bash
+npx --yes @lark-apaas/openclaw-dev-cli link --app-id <id> --template <type>
+```
+
+| 选项 | 说明 | 默认值 |
+|------|------|--------|
+| `--dir <path>` | 项目目录 | `.` |
+| `--app-id <id>` | 要关联的应用 ID | 不传则自动注册 |
+| `--template <template>` | 技术栈类型 | 从 package.json mclaw 字段读取 |
+| `--title <title>` | 应用名称 | 目录名 |
+| `--description <desc>` | 应用描述 | `""` |
+
+### deploy — 部署应用
+
+```bash
+npx --yes @lark-apaas/openclaw-dev-cli deploy
+```
+
+| 选项 | 说明 | 默认值 |
+|------|------|--------|
+| `--dir <path>` | 项目目录 | `.` |
+| `--skip-build` | 跳过构建 | `false` |
+
+## 全局选项
+
+| 选项 | 说明 |
+|------|------|
+| `--canary <env>` | 设置 canary 泳道 |
+| `-V, --version` | 输出版本号 |
+
+## 支持的技术栈
+
+| 模板 | 说明 |
+|------|------|
+| `html` | 纯 HTML + Tailwind CDN |
+| `nextjs-static` | Next.js Pages Router，静态导出 |
+| `nextjs` | Next.js App Router 全栈 |
+
+## 环境配置
+
+在项目目录下创建 `.env` 文件：
+
+```
+FORCE_AUTHN_INNERAPI_DOMAIN=<API域名>
+FORCE_AUTHN_ACCESS_KEY=<AK>
+FORCE_AUTHN_ACCESS_SECRET=<SK>
+```
+
+## License
+
+MIT

package/dist/index.js

@@ -7288,7 +7288,7 @@ var initCommand = {
       const hasPackageJson = import_node_fs9.default.existsSync(import_node_path12.default.join(projectDir, "package.json"));
       const existingMeta = readSparkMeta(projectDir);
       const title = options.title ?? import_node_path12.default.basename(projectDir);
-      let stackVersion = existingMeta.stack_version;
+      let templateVersion = existingMeta.templateVersion;
       if (!hasPackageJson) {
         if (!options.template) {
           throw new Error(
@@ -7306,26 +7306,26 @@ Available: ${TEMPLATE_TYPES.join(", ")}`
           projectName: import_node_path12.default.basename(projectDir),
           localTemplate: options.localTemplate
         });
-        stackVersion = version;
+        templateVersion = version;
       }
-      let stack = options.template ?? existingMeta.stack;
-      if (!stack) {
+      let template = options.template ?? existingMeta.template;
+      if (!template) {
         const pkgPath = import_node_path12.default.join(projectDir, "package.json");
         if (import_node_fs9.default.existsSync(pkgPath)) {
           try {
             const pkg = JSON.parse(import_node_fs9.default.readFileSync(pkgPath, "utf-8"));
-            stack = pkg.mclaw?.stack;
-            stackVersion = stackVersion ?? pkg.mclaw?.stackVersion;
+            template = pkg.mclaw?.stack;
+            templateVersion = templateVersion ?? pkg.mclaw?.stackVersion;
           } catch {
           }
         }
       }
-      if (!stack) {
+      if (!template) {
         throw new Error(
-          "Cannot determine stack type. Please provide --template or ensure package.json has mclaw.stack field."
+          "Cannot determine template type. Please provide --template or ensure package.json has mclaw.stack field."
         );
       }
-      let appId = options.appId ?? existingMeta.app_id;
+      let appId = options.appId ?? existingMeta.appId;
       if (!appId) {
         const result = await createSubApp({
           name: title,
@@ -7337,9 +7337,9 @@ Available: ${TEMPLATE_TYPES.join(", ")}`
         console.log(`Using existing app_id: ${appId}`);
       }
       writeSparkMeta(projectDir, {
-        app_id: appId,
-        stack,
-        stack_version: stackVersion ?? "0.1.0"
+        appId,
+        template,
+        templateVersion: templateVersion ?? "0.1.0"
       });
       if (!options.skipInstall) {
         console.log("\nInstalling dependencies...");
@@ -7352,7 +7352,7 @@ Available: ${TEMPLATE_TYPES.join(", ")}`
 \u2705 Initialized successfully!`);
       console.log(`   Directory: ${projectDir}`);
       console.log(`   App ID:    ${appId}`);
-      console.log(`   Stack:     ${stack}`);
+      console.log(`   Template:  ${template}`);
     });
   }
 };
@@ -7399,9 +7399,9 @@ Available: ${TEMPLATE_TYPES.join(", ")}`
         console.log(`Using app_id: ${appId}`);
       }
       writeSparkMeta(projectDir, {
-        app_id: appId,
-        stack,
-        stack_version: stackVersion
+        appId,
+        template: stack,
+        templateVersion: stackVersion
       });
       if (import_node_fs10.default.existsSync(pkgPath)) {
         const pkg = JSON.parse(import_node_fs10.default.readFileSync(pkgPath, "utf-8"));
@@ -7483,8 +7483,14 @@ function configureTosutil(tosutilPath, confPath, credential) {
   ], { stdio: "pipe" });
 }
 function uploadToTos(tosutilPath, confPath, sourceDir, destUrl) {
-  console.error(`${LOG_PREFIX} Uploading ${sourceDir} \u2192 ${destUrl}`);
-  (0, import_node_child_process3.execFileSync)(tosutilPath, [
+  console.log(`${LOG_PREFIX} Uploading ${sourceDir} \u2192 ${destUrl}`);
+  const files = import_node_fs12.default.readdirSync(sourceDir);
+  if (files.length === 0) {
+    console.warn(`${LOG_PREFIX} Warning: source directory is empty, skipping upload.`);
+    return;
+  }
+  console.log(`${LOG_PREFIX} Source files: ${files.length}`);
+  const output = (0, import_node_child_process3.execFileSync)(tosutilPath, [
     "cp",
     "-conf",
     confPath,
@@ -7499,7 +7505,19 @@ function uploadToTos(tosutilPath, confPath, sourceDir, destUrl) {
     "-ps",
     "10485760",
     "-f"
-  ], { stdio: "inherit" });
+  ], { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+  console.log(output);
+  const succeedMatch = output.match(/Succeed count is:\s*(\d+)/);
+  const failedMatch = output.match(/Failed count is:\s*(\d+)/);
+  const succeedCount = succeedMatch ? parseInt(succeedMatch[1], 10) : 0;
+  const failedCount = failedMatch ? parseInt(failedMatch[1], 10) : 0;
+  if (failedCount > 0) {
+    throw new Error(`${LOG_PREFIX} Upload failed: ${failedCount} files failed, ${succeedCount} succeeded.`);
+  }
+  if (succeedCount === 0) {
+    throw new Error(`${LOG_PREFIX} Upload failed: no files were uploaded. Check tosutil credentials and bucket permissions.`);
+  }
+  console.log(`${LOG_PREFIX} Uploaded ${succeedCount} files successfully.`);
 }
 function uploadWithCredential(tosutilPath, sourceDir, destUrl, credential, label) {
   const confPath = import_node_path15.default.join(import_node_os2.default.tmpdir(), `.tosutilconfig-mclaw-${label}-${process.pid}`);
@@ -7532,7 +7550,8 @@ function uploadOutput(options) {
   }
   if (validated.hasOutputStatic) {
     const localPath = import_node_path15.default.join(distDir, OUTPUT_STATIC_DIR);
-    const destUrl = `${preUploadResult.uploadPrefix}${OUTPUT_STATIC_DIR}/`;
+    const prefix = preUploadResult.uploadPrefix.endsWith("/") ? preUploadResult.uploadPrefix : `${preUploadResult.uploadPrefix}/`;
+    const destUrl = `${prefix}${OUTPUT_STATIC_DIR}/`;
     console.error(`${LOG_PREFIX} Uploading output_static (static credential)...`);
     uploadWithCredential(tosutilPath, localPath, destUrl, {
       accessKeyID: preUploadResult.uploadCredential.AccessKeyID,
@@ -7555,30 +7574,30 @@ var deployCommand = {
         throw new Error('.spark/meta.json not found. Run "mclaw-dev init" first.');
       }
       const meta = JSON.parse(import_node_fs13.default.readFileSync(metaPath, "utf-8"));
-      if (!meta.app_id || !meta.stack) {
+      if (!meta.appId || !meta.template) {
         throw new Error('.spark/meta.json is incomplete. Run "mclaw-dev init" to fix.');
       }
-      const publishResult = await createPublish(meta.app_id);
+      const publishResult = await createPublish(meta.appId);
       console.log(`Version: ${publishResult.version}, PublishID: ${publishResult.publishID}`);
       console.log("\nPreparing upload credentials...");
-      const artifactCredential = await genArtifactUploadCredential(meta.app_id, String(publishResult.version));
-      const bucketId = await getDefaultBucketId(meta.app_id);
-      const preUploadResult = await preUploadStatic(meta.app_id, bucketId);
+      const artifactCredential = await genArtifactUploadCredential(meta.appId, String(publishResult.version));
+      const bucketId = await getDefaultBucketId(meta.appId);
+      const preUploadResult = await preUploadStatic(meta.appId, bucketId);
       console.log(`Static prefix: ${preUploadResult.downloadURLPrefix}`);
       if (!options.skipBuild) {
-        const cdnDomain = buildCdnDomain(meta.app_id, publishResult.version);
+        const cdnDomain = buildCdnDomain(meta.appId, publishResult.version);
         const buildEnv = {
           ...process.env,
-          MCLAW_APP_ID: meta.app_id,
+          MCLAW_APP_ID: meta.appId,
           MCLAW_VERSION: String(publishResult.version),
-          MCLAW_STACK: meta.stack,
+          MCLAW_STACK: meta.template,
           MCLAW_CDN_DOMAIN: cdnDomain,
           MCLAW_STATIC_PREFIX: preUploadResult.downloadURLPrefix
         };
         console.log("\nBuilding...");
-        console.log(`  MCLAW_APP_ID=${meta.app_id}`);
+        console.log(`  MCLAW_APP_ID=${meta.appId}`);
         console.log(`  MCLAW_VERSION=${publishResult.version}`);
-        console.log(`  MCLAW_STACK=${meta.stack}`);
+        console.log(`  MCLAW_STACK=${meta.template}`);
         console.log(`  MCLAW_CDN_DOMAIN=${cdnDomain}`);
         console.log(`  MCLAW_STATIC_PREFIX=${preUploadResult.downloadURLPrefix}`);
         (0, import_node_child_process4.execSync)("npm run build", {
@@ -7591,7 +7610,7 @@ var deployCommand = {
       console.log("Build output validated.");
       uploadOutput({
         projectDir,
-        appId: meta.app_id,
+        appId: meta.appId,
         version: publishResult.version,
         validated,
         artifactCredential,
@@ -7599,7 +7618,7 @@ var deployCommand = {
       });
       if (validated.hasOutputStatic) {
         console.log("\nNotifying upload complete...");
-        const callbackResult = await callbackStatic(meta.app_id, bucketId, preUploadResult.uploadID);
+        const callbackResult = await callbackStatic(meta.appId, bucketId, preUploadResult.uploadID);
         console.log(`Uploaded ${callbackResult.attachments.length} static files.`);
       }
       let routesConfig;
@@ -7608,18 +7627,18 @@ var deployCommand = {
         routesConfig = import_node_fs13.default.readFileSync(routesPath, "utf-8");
         console.log("Found routes.json, including in publish.");
       }
-      const publishUpdateResult = await updatePublish(meta.app_id, {
+      const publishUpdateResult = await updatePublish(meta.appId, {
         publishID: publishResult.publishID,
         routesConfig
       });
-      const appUrl = publishUpdateResult.onlineURL || buildAppUrl(meta.app_id);
+      const appUrl = publishUpdateResult.onlineURL || buildAppUrl(meta.appId);
       writeSparkMeta(projectDir, {
         ...meta,
-        app_url: appUrl
+        appUrl
       });
       console.log(`
 \u2705 Deployed successfully!`);
-      console.log(`   App ID:  ${meta.app_id}`);
+      console.log(`   App ID:  ${meta.appId}`);
       console.log(`   Version: ${publishResult.version}`);
       console.log(`   URL:     ${appUrl}`);
     });
@@ -7653,7 +7672,7 @@ function loadEnvFile(filePath) {
   }
 }
 loadEnvFile(import_node_path17.default.join(process.cwd(), ".env"));
-var VERSION = "0.1.0";
+var VERSION = "0.1.5";
 var cli = new OpenClawCLI(VERSION);
 cli.useAll(commands);
 cli.run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/openclaw-dev-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CLI tool for OpenClaw development",
   "main": "dist/index.js",
   "bin": {