@lark-apaas/openclaw-dev-cli 0.1.6 → 0.1.8

package/dist/index.js

@@ -4185,7 +4185,14 @@ async function genArtifactUploadCredential(appId, commitID = "latest") {
   if (!body.data?.accessKeyID || !body.data?.secretAccessKey || !body.data?.sessionToken) {
     throw new Error("genArtifactUploadCredential returned incomplete credentials");
   }
-  logResponse("genArtifactUploadCredential", { accessKeyID: body.data.accessKeyID, expiredTime: body.data.expiredTime });
+  if (!body.data.buckets?.deploy || !body.data.buckets?.resource) {
+    throw new Error("genArtifactUploadCredential returned incomplete bucket info");
+  }
+  logResponse("genArtifactUploadCredential", {
+    accessKeyID: body.data.accessKeyID,
+    expiredTime: body.data.expiredTime,
+    buckets: body.data.buckets
+  });
   return body.data;
 }
 async function getDefaultBucketId(appId) {
@@ -7353,9 +7360,35 @@ Available: ${TEMPLATE_TYPES.join(", ")}`
       console.log(`   Directory: ${projectDir}`);
       console.log(`   App ID:    ${appId}`);
       console.log(`   Template:  ${template}`);
+      printDirectoryTree(projectDir);
     });
   }
 };
+var TREE_IGNORE = /* @__PURE__ */ new Set(["node_modules", ".git", ".turbo", ".next"]);
+var TREE_MAX_DEPTH = 2;
+function printDirectoryTree(projectDir) {
+  console.log("\nProject structure:");
+  console.log(import_node_path12.default.basename(projectDir) || projectDir);
+  walk(projectDir, "", 0);
+}
+function walk(current, prefix, depth) {
+  if (depth >= TREE_MAX_DEPTH) return;
+  const entries = import_node_fs9.default.readdirSync(current, { withFileTypes: true }).filter((entry) => !TREE_IGNORE.has(entry.name)).sort((a, b2) => {
+    if (a.isDirectory() !== b2.isDirectory()) {
+      return a.isDirectory() ? -1 : 1;
+    }
+    return a.name.localeCompare(b2.name);
+  });
+  entries.forEach((entry, index) => {
+    const isLast = index === entries.length - 1;
+    const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
+    const nextPrefix = prefix + (isLast ? "    " : "\u2502   ");
+    console.log(`${prefix}${connector}${entry.name}${entry.isDirectory() ? "/" : ""}`);
+    if (entry.isDirectory()) {
+      walk(import_node_path12.default.join(current, entry.name), nextPrefix, depth + 1);
+    }
+  });
+}
 
 // src/commands/link/index.ts
 var import_node_path13 = __toESM(require("path"));
@@ -7451,6 +7484,15 @@ var import_node_os2 = __toESM(require("os"));
 var import_node_path15 = __toESM(require("path"));
 var import_node_child_process3 = require("child_process");
 var LOG_PREFIX = "[upload]";
+function normalizeBucket(bucket) {
+  const withScheme = bucket.startsWith("tos://") ? bucket : `tos://${bucket}`;
+  return withScheme.replace(/\/+$/, "");
+}
+function buildDestUrl(bucket, suffix) {
+  const base = normalizeBucket(bucket);
+  const normalizedSuffix = suffix.replace(/^\/+/, "");
+  return `${base}/${normalizedSuffix}`;
+}
 var TOSUTIL_DEFAULTS = {
   endpoint: "tos-cn-beijing.volces.com",
   region: "cn-beijing"
@@ -7536,22 +7578,26 @@ function uploadOutput(options) {
   const { projectDir, appId, version, validated, artifactCredential, preUploadResult } = options;
   const distDir = import_node_path15.default.join(projectDir, DIST_DIR);
   const tosutilPath = resolveTosutilPath();
+  const deployBucket = artifactCredential.buckets?.deploy;
+  const resourceBucket = artifactCredential.buckets?.resource;
+  if (!deployBucket || !resourceBucket) {
+    throw new Error("Artifact credential missing bucket info");
+  }
   if (validated.hasOutput) {
     const localPath = import_node_path15.default.join(distDir, OUTPUT_DIR);
-    const destUrl = `tos://miaoda-boe-compiled/${appId}/${version}/`;
+    const destUrl = buildDestUrl(deployBucket, `${appId}/${version}/`);
     console.error(`${LOG_PREFIX} Uploading output (artifact credential)...`);
     uploadWithCredential(tosutilPath, localPath, destUrl, artifactCredential, "output");
   }
   if (validated.hasOutputResource) {
     const localPath = import_node_path15.default.join(distDir, OUTPUT_RESOURCE_DIR);
-    const destUrl = `tos://miaoda-boe-cdn/${appId}/${version}/client/`;
+    const destUrl = buildDestUrl(resourceBucket, `${appId}/${version}/client/`);
     console.error(`${LOG_PREFIX} Uploading output_resource (artifact credential)...`);
     uploadWithCredential(tosutilPath, localPath, destUrl, artifactCredential, "resource");
   }
   if (validated.hasOutputStatic) {
     const localPath = import_node_path15.default.join(distDir, OUTPUT_STATIC_DIR);
-    const prefix = preUploadResult.uploadPrefix.endsWith("/") ? preUploadResult.uploadPrefix : `${preUploadResult.uploadPrefix}/`;
-    const destUrl = `${prefix}${OUTPUT_STATIC_DIR}/`;
+    const destUrl = preUploadResult.uploadPrefix.endsWith("/") ? preUploadResult.uploadPrefix : `${preUploadResult.uploadPrefix}/`;
     console.error(`${LOG_PREFIX} Uploading output_static (static credential)...`);
     uploadWithCredential(tosutilPath, localPath, destUrl, {
       accessKeyID: preUploadResult.uploadCredential.AccessKeyID,
@@ -7592,7 +7638,7 @@ var deployCommand = {
           MCLAW_VERSION: String(publishResult.version),
           MCLAW_STACK: meta.template,
           MCLAW_CDN_DOMAIN: cdnDomain,
-          MCLAW_STATIC_PREFIX: preUploadResult.downloadURLPrefix
+          MCLAW_STATIC_PREFIX: preUploadResult.downloadURLPrefix.replace(/\/+$/, "")
         };
         console.log("\nBuilding...");
         console.log(`  MCLAW_APP_ID=${meta.appId}`);
@@ -7672,7 +7718,7 @@ function loadEnvFile(filePath) {
   }
 }
 loadEnvFile(import_node_path17.default.join(process.cwd(), ".env"));
-var VERSION = "0.1.6";
+var VERSION = "0.1.7";
 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.6",
+  "version": "0.1.8",
   "description": "CLI tool for OpenClaw development",
   "main": "dist/index.js",
   "bin": {