@onexapis/cli 1.0.0 → 1.0.1

package/dist/cli.mjs

@@ -11,8 +11,9 @@ import ejs from 'ejs';
 import archiver from 'archiver';
 import FormData from 'form-data';
 import fetch from 'node-fetch';
-import { S3Client, PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';
-import { glob } from 'glob';
+import { PutObjectCommand, GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import os from 'os';
+import AdmZip from 'adm-zip';
 
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
@@ -180,18 +181,19 @@ function getProjectRoot() {
   return process.cwd();
 }
 function getThemesDir() {
-  try {
-    return path.join(getProjectRoot(), "src/themes");
-  } catch (e) {
-    return path.join(getProjectRoot(), "themes");
+  const root = getProjectRoot();
+  const themesDir = path.join(root, "themes");
+  if (fs.existsSync(themesDir)) {
+    return themesDir;
   }
+  return path.join(root, "src/themes");
 }
 function getFeaturesDir() {
   return path.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  return fs.existsSync(path.join(root, "src/themes")) && fs.existsSync(path.join(root, "src/lib/registry"));
+  return fs.existsSync(path.join(root, "themes")) || fs.existsSync(path.join(root, "src/themes"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -208,12 +210,12 @@ function listThemes() {
   }
   return fs.readdirSync(themesDir).filter((name) => {
     const themePath = path.join(themesDir, name);
-    return fs.statSync(themePath).isDirectory() && fs.existsSync(path.join(themePath, "manifest.ts"));
+    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path.join(themePath, "theme.config.ts")) || fs.existsSync(path.join(themePath, "bundle-entry.ts")) || fs.existsSync(path.join(themePath, "manifest.ts")));
   });
 }
 function themeExists(themeName) {
   const themePath = path.join(getThemesDir(), themeName);
-  return fs.existsSync(themePath) && fs.existsSync(path.join(themePath, "manifest.ts"));
+  return fs.existsSync(themePath) && (fs.existsSync(path.join(themePath, "theme.config.ts")) || fs.existsSync(path.join(themePath, "bundle-entry.ts")) || fs.existsSync(path.join(themePath, "manifest.ts")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -407,7 +409,9 @@ Add your theme-specific blocks here.
     logger.newLine();
     logger.section("Theme structure:");
     logger.log("  src/manifest.ts    - Theme manifest and exports");
-    logger.log("  src/config.ts      - Design tokens (colors, typography, etc.)");
+    logger.log(
+      "  src/config.ts      - Design tokens (colors, typography, etc.)"
+    );
     logger.log("  src/layout.ts      - Header and footer configuration");
     logger.log("  src/sections/      - Custom sections for your theme");
     logger.log("  src/blocks/        - Reusable blocks");
@@ -1410,8 +1414,16 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const manifestPath = path.join(getThemesDir(), theme, "manifest.ts");
-    const manifestContent = fs.readFileSync(manifestPath, "utf-8");
+    const themeDir = path.join(getThemesDir(), theme);
+    const candidates = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"];
+    let manifestContent = "";
+    for (const candidate of candidates) {
+      const candidatePath = path.join(themeDir, candidate);
+      if (fs.existsSync(candidatePath)) {
+        manifestContent = fs.readFileSync(candidatePath, "utf-8");
+        break;
+      }
+    }
     const nameMatch = manifestContent.match(/name:\s*["'](.+)["']/);
     const versionMatch = manifestContent.match(/version:\s*["'](.+)["']/);
     const descMatch = manifestContent.match(/description:\s*["'](.+)["']/);
@@ -1953,13 +1965,11 @@ function getS3Client() {
     return new S3Client({
       endpoint: endpointUrl,
       region: "us-east-1",
-      // MinIO doesn't use real regions
       credentials: {
         accessKeyId: process.env.MINIO_ACCESS_KEY || "minioadmin",
         secretAccessKey: process.env.MINIO_SECRET_KEY || "minioadmin"
       },
       forcePathStyle: true
-      // Required for MinIO
     });
   }
   if (adapterMode === "local") {
@@ -2029,36 +2039,40 @@ async function readManifest() {
     "No manifest.ts or package.json found. Are you in a theme directory?"
   );
 }
-function getContentType(filename) {
-  const ext = path.extname(filename).toLowerCase();
-  const types = {
-    ".js": "application/javascript",
-    ".mjs": "application/javascript",
-    ".json": "application/json",
-    ".css": "text/css",
-    ".png": "image/png",
-    ".jpg": "image/jpeg",
-    ".jpeg": "image/jpeg",
-    ".svg": "image/svg+xml",
-    ".woff2": "font/woff2",
-    ".woff": "font/woff",
-    ".ttf": "font/ttf",
-    ".ts": "text/plain"
-  };
-  return types[ext] || "application/octet-stream";
+async function createZipFromDir(sourceDir, outputPath, excludePatterns = []) {
+  return new Promise((resolve, reject) => {
+    const output = fs.createWriteStream(outputPath);
+    const archive = archiver("zip", { zlib: { level: 6 } });
+    output.on("close", () => resolve());
+    archive.on("error", (err) => reject(err));
+    archive.pipe(output);
+    archive.glob("**/*", {
+      cwd: sourceDir,
+      dot: true,
+      ignore: excludePatterns
+    });
+    archive.finalize();
+  });
 }
-async function uploadFile(s3Client, bucket, themeId, version, baseDir, file) {
-  const filePath = path.join(baseDir, file);
-  const content = await fs.readFile(filePath);
-  const s3Key = `themes/${themeId}/${version}/${file}`;
-  await s3Client.send(
-    new PutObjectCommand({
-      Bucket: bucket,
-      Key: s3Key,
-      Body: content,
-      ContentType: getContentType(file)
-    })
-  );
+async function findSourceDir(themeId, explicitDir) {
+  if (explicitDir) {
+    if (await fs.pathExists(explicitDir)) return explicitDir;
+    return null;
+  }
+  const searchPaths = [
+    process.cwd(),
+    path.resolve(process.cwd(), `../../themes/${themeId}`),
+    path.resolve(process.cwd(), `../themes/${themeId}`)
+  ];
+  const markers = ["theme.config.ts", "bundle-entry.ts"];
+  for (const dir of searchPaths) {
+    for (const marker of markers) {
+      if (await fs.pathExists(path.join(dir, marker))) {
+        return dir;
+      }
+    }
+  }
+  return null;
 }
 async function updateLatestPointer(s3Client, bucket, themeId, version) {
   const latestData = {
@@ -2076,12 +2090,18 @@ async function updateLatestPointer(s3Client, bucket, themeId, version) {
 }
 async function uploadCommand(options) {
   logger.header("Upload Theme to S3");
-  ensureOneXProject();
   const spinner = ora("Preparing theme upload...").start();
   try {
-    const manifest = await readManifest();
-    const themeId = manifest.themeId;
-    const version = options.version || manifest.version || "1.0.0";
+    let themeId;
+    let version;
+    if (options.theme) {
+      themeId = options.theme;
+      version = options.version || "1.0.0";
+    } else {
+      const manifest = await readManifest();
+      themeId = manifest.themeId;
+      version = options.version || manifest.version || "1.0.0";
+    }
     spinner.text = `Found theme: ${themeId}@${version}`;
     const bucket = options.bucket || getBucketName(options.environment);
     const s3Client = getS3Client();
@@ -2102,67 +2122,113 @@ async function uploadCommand(options) {
       process.exit(1);
     }
     spinner.succeed(`Found compiled theme at: ${compiledDir}`);
-    spinner.start(`Scanning files...`);
-    const files = await glob("**/*", {
-      cwd: compiledDir,
-      nodir: true,
-      dot: true
-    });
-    if (files.length === 0) {
-      spinner.fail(chalk4.red("No files found in compiled theme directory"));
-      process.exit(1);
-    }
-    spinner.succeed(`Found ${files.length} files to upload`);
+    spinner.start("Creating bundle.zip...");
+    const tmpDir = os.tmpdir();
+    const bundleZipPath = path.join(tmpDir, `${themeId}-${version}-bundle.zip`);
+    await createZipFromDir(compiledDir, bundleZipPath);
+    const bundleZipBuffer = await fs.readFile(bundleZipPath);
+    const bundleSizeMB = (bundleZipBuffer.length / 1024 / 1024).toFixed(2);
+    spinner.succeed(`Created bundle.zip (${bundleSizeMB} MB)`);
     if (options.dryRun) {
-      spinner.info(chalk4.yellow("Dry run mode - no files will be uploaded"));
-      console.log(chalk4.gray("\nFiles to upload:"));
-      const displayFiles = files.slice(0, 10);
-      displayFiles.forEach((file) => console.log(chalk4.gray(`  - ${file}`)));
-      if (files.length > 10) {
-        console.log(chalk4.gray(`  ... and ${files.length - 10} more files
-`));
-      }
-      console.log(chalk4.cyan(`
-S3 bucket: ${bucket}`));
+      spinner.info(chalk4.yellow("Dry run mode \u2014 no files will be uploaded"));
+      console.log();
+      console.log(chalk4.gray(`  bundle.zip: ${bundleSizeMB} MB`));
       console.log(
-        chalk4.cyan(`S3 path: s3://${bucket}/themes/${themeId}/${version}/
-`)
+        chalk4.cyan(
+          `  S3 path: s3://${bucket}/themes/${themeId}/${version}/bundle.zip`
+        )
       );
+      if (!options.skipSource) {
+        const sourceDir = await findSourceDir(themeId, options.sourceDir);
+        if (sourceDir) {
+          console.log(chalk4.gray(`  source dir: ${sourceDir}`));
+          console.log(
+            chalk4.cyan(
+              `  S3 path: s3://${bucket}/themes/${themeId}/${version}/source.zip`
+            )
+          );
+        } else {
+          console.log(
+            chalk4.yellow("  source dir: not found (source.zip will be skipped)")
+          );
+        }
+      }
+      console.log();
+      await fs.remove(bundleZipPath);
       return;
     }
-    spinner.start(`Uploading to S3: ${bucket}...`);
-    let uploaded = 0;
-    const total = files.length;
-    const batchSize = 10;
-    for (let i = 0; i < files.length; i += batchSize) {
-      const batch = files.slice(i, i + batchSize);
-      await Promise.all(
-        batch.map(async (file) => {
-          await uploadFile(
-            s3Client,
-            bucket,
-            themeId,
-            version,
-            compiledDir,
-            file
-          );
-          uploaded++;
-          spinner.text = `Uploading... ${uploaded}/${total} files (${Math.round(uploaded / total * 100)}%)`;
-        })
-      );
+    spinner.start("Uploading bundle.zip to S3...");
+    const bundleS3Key = `themes/${themeId}/${version}/bundle.zip`;
+    await s3Client.send(
+      new PutObjectCommand({
+        Bucket: bucket,
+        Key: bundleS3Key,
+        Body: bundleZipBuffer,
+        ContentType: "application/zip"
+      })
+    );
+    spinner.succeed(
+      `Uploaded bundle.zip ${chalk4.gray(`\u2192 s3://${bucket}/${bundleS3Key}`)}`
+    );
+    await fs.remove(bundleZipPath);
+    let sourceUploaded = false;
+    if (!options.skipSource) {
+      spinner.start("Looking for source directory...");
+      const sourceDir = await findSourceDir(themeId, options.sourceDir);
+      if (sourceDir) {
+        spinner.succeed(`Found source at: ${sourceDir}`);
+        spinner.start("Creating source.zip...");
+        const sourceZipPath = path.join(
+          tmpDir,
+          `${themeId}-${version}-source.zip`
+        );
+        await createZipFromDir(sourceDir, sourceZipPath, [
+          "node_modules/**",
+          "dist/**",
+          ".git/**",
+          "*.zip",
+          ".next/**",
+          ".turbo/**"
+        ]);
+        const sourceZipBuffer = await fs.readFile(sourceZipPath);
+        const sourceSizeMB = (sourceZipBuffer.length / 1024 / 1024).toFixed(2);
+        spinner.succeed(`Created source.zip (${sourceSizeMB} MB)`);
+        spinner.start("Uploading source.zip to S3...");
+        const sourceS3Key = `themes/${themeId}/${version}/source.zip`;
+        await s3Client.send(
+          new PutObjectCommand({
+            Bucket: bucket,
+            Key: sourceS3Key,
+            Body: sourceZipBuffer,
+            ContentType: "application/zip"
+          })
+        );
+        spinner.succeed(
+          `Uploaded source.zip ${chalk4.gray(`\u2192 s3://${bucket}/${sourceS3Key}`)}`
+        );
+        await fs.remove(sourceZipPath);
+        sourceUploaded = true;
+      } else {
+        spinner.warn(
+          chalk4.yellow("Source directory not found \u2014 skipping source.zip")
+        );
+      }
     }
-    spinner.succeed(`Uploaded ${total} files to S3`);
     spinner.start("Updating latest.json pointer...");
     await updateLatestPointer(s3Client, bucket, themeId, version);
     spinner.succeed("Updated latest.json pointer");
     console.log();
-    logger.success(chalk4.green.bold("\u2705 Theme uploaded successfully!"));
+    logger.success(chalk4.green.bold("Theme uploaded successfully!"));
     console.log();
     console.log(
       chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${version}`)
     );
     console.log(chalk4.cyan("   Bucket:  ") + chalk4.white(bucket));
-    console.log(chalk4.cyan("   Files:   ") + chalk4.white(total));
+    console.log(
+      chalk4.cyan("   Files:   ") + chalk4.white(
+        `bundle.zip${sourceUploaded ? " + source.zip" : ""}`
+      )
+    );
     console.log(
       chalk4.cyan("   Path:    ") + chalk4.gray(`s3://${bucket}/themes/${themeId}/${version}/`)
     );
@@ -2266,79 +2332,45 @@ async function resolveLatestVersion(s3Client, bucket, themeId) {
     );
   }
 }
-async function downloadManifest(s3Client, bucket, themeId, version) {
-  try {
-    const response = await s3Client.send(
-      new GetObjectCommand({
-        Bucket: bucket,
-        Key: `themes/${themeId}/${version}/manifest.json`
-      })
-    );
-    const body = await streamToString(response.Body);
-    return JSON.parse(body);
-  } catch (error) {
-    throw new Error(
-      `Failed to download manifest for ${themeId}@${version}: ${error.message}
-The theme may not exist in S3 bucket "${bucket}".`
-    );
-  }
-}
-async function downloadFile(s3Client, bucket, themeId, version, file, outputDir) {
-  const s3Key = `themes/${themeId}/${version}/${file}`;
-  const localPath = path.join(outputDir, file);
-  await fs.ensureDir(path.dirname(localPath));
-  try {
-    const response = await s3Client.send(
-      new GetObjectCommand({
-        Bucket: bucket,
-        Key: s3Key
-      })
-    );
-    const content = await streamToBuffer(response.Body);
-    await fs.writeFile(localPath, content);
-  } catch (error) {
-    throw new Error(`Failed to download ${file}: ${error.message}`);
-  }
-}
-function collectFilesToDownload(manifest) {
-  const files = ["manifest.json"];
-  if (manifest.output) {
-    if (manifest.output.entry) {
-      files.push(manifest.output.entry);
-    }
-    if (manifest.output.chunks) {
-      files.push(...manifest.output.chunks);
-    }
-    if (manifest.output.assets) {
-      files.push(...manifest.output.assets);
+async function createCompatibilityFiles(outputDir, manifest) {
+  var _a;
+  const entryFile = ((_a = manifest.output) == null ? void 0 : _a.entry) || "bundle-entry.js";
+  if (entryFile !== "bundle-entry.js" && entryFile.startsWith("bundle-entry-")) {
+    const hashedPath = path.join(outputDir, entryFile);
+    const stablePath = path.join(outputDir, "bundle-entry.js");
+    if (await fs.pathExists(hashedPath)) {
+      await fs.copy(hashedPath, stablePath);
+      const mapPath = hashedPath + ".map";
+      if (await fs.pathExists(mapPath)) {
+        await fs.copy(mapPath, stablePath + ".map");
+      }
     }
   }
-  return files;
-}
-async function createCompatibilityFiles(outputDir) {
   const sectionsRegistryPath = path.join(outputDir, "sections-registry.js");
   const content = `// Re-export all sections from bundle-entry
 // This file exists to maintain compatibility with the import path
 export * from './bundle-entry.js';
 `;
   await fs.writeFile(sectionsRegistryPath, content, "utf-8");
+  const pkgJsonPath = path.join(outputDir, "package.json");
+  await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, bucket) {
   console.log();
-  logger.error(chalk4.red.bold("\u274C Theme download failed"));
+  logger.error(chalk4.red.bold("Theme download failed"));
   console.log();
   console.log(chalk4.yellow("Possible reasons:"));
   console.log(chalk4.gray("  1. Theme not uploaded to S3 yet"));
   console.log(chalk4.gray("  2. AWS credentials not configured correctly"));
   console.log(chalk4.gray("  3. Bucket name or region is incorrect"));
-  console.log(chalk4.gray("  4. Theme files are incomplete or corrupted"));
+  console.log(chalk4.gray("  4. bundle.zip is missing or corrupted"));
   console.log();
   console.log(chalk4.cyan.bold("To fix this:"));
   console.log();
   console.log(chalk4.white("1. Compile and upload the theme:"));
   console.log(chalk4.gray(`   cd themes/${themeId}`));
   console.log(chalk4.gray("   pnpm build"));
-  console.log(chalk4.gray("   pnpm upload"));
+  console.log(chalk4.gray("   onex upload"));
   console.log();
   console.log(chalk4.white("2. Verify AWS credentials are set:"));
   console.log(
@@ -2354,7 +2386,11 @@ function showDownloadFailureHelp(themeId, bucket) {
   );
   console.log();
   console.log(chalk4.white("4. Verify theme exists in S3:"));
-  console.log(chalk4.gray(`   aws s3 ls s3://${bucket}/themes/${themeId}/`));
+  console.log(
+    chalk4.gray(
+      `   aws s3 ls s3://${bucket}/themes/${themeId}/`
+    )
+  );
   console.log();
 }
 async function downloadCommand(options) {
@@ -2382,55 +2418,44 @@ async function downloadCommand(options) {
       spinner.succeed(
         `Resolved latest version: ${chalk4.cyan(resolvedVersion)}`
       );
-      spinner.start("Downloading manifest...");
     }
-    const manifest = await downloadManifest(
-      s3Client,
-      bucket,
-      themeId,
-      resolvedVersion
+    spinner.start(
+      `Downloading bundle.zip for ${themeId}@${resolvedVersion}...`
+    );
+    const s3Key = `themes/${themeId}/${resolvedVersion}/bundle.zip`;
+    const response = await s3Client.send(
+      new GetObjectCommand({
+        Bucket: bucket,
+        Key: s3Key
+      })
     );
-    spinner.succeed("Downloaded manifest");
-    spinner.start("Preparing output directory...");
+    const zipBuffer = await streamToBuffer(response.Body);
+    const sizeMB = (zipBuffer.length / 1024 / 1024).toFixed(2);
+    spinner.succeed(`Downloaded bundle.zip (${sizeMB} MB)`);
+    spinner.start("Extracting bundle...");
     await fs.remove(outputDir);
     await fs.ensureDir(outputDir);
-    spinner.succeed("Output directory ready");
-    spinner.start("Downloading theme files...");
-    const files = collectFilesToDownload(manifest);
-    let downloaded = 0;
-    const total = files.length;
-    const batchSize = 10;
-    for (let i = 0; i < files.length; i += batchSize) {
-      const batch = files.slice(i, i + batchSize);
-      await Promise.all(
-        batch.map(async (file) => {
-          await downloadFile(
-            s3Client,
-            bucket,
-            themeId,
-            resolvedVersion,
-            file,
-            outputDir
-          );
-          downloaded++;
-          spinner.text = `Downloading... ${downloaded}/${total} files (${Math.round(downloaded / total * 100)}%)`;
-        })
-      );
-    }
-    spinner.succeed(`Downloaded ${total} files`);
-    await createCompatibilityFiles(outputDir);
+    const zip = new AdmZip(zipBuffer);
+    zip.extractAllTo(outputDir, true);
+    const entries = zip.getEntries().filter((e) => !e.isDirectory);
+    spinner.succeed(`Extracted ${entries.length} files to ${outputDir}`);
+    const manifestPath = path.join(outputDir, "manifest.json");
+    const manifest = await fs.readJson(manifestPath);
+    await createCompatibilityFiles(outputDir, manifest);
     console.log();
-    logger.success(chalk4.green.bold("\u2705 Theme downloaded successfully!"));
+    logger.success(chalk4.green.bold("Theme downloaded successfully!"));
     console.log();
     console.log(
       chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${resolvedVersion}`)
     );
     console.log(chalk4.cyan("   Bucket:  ") + chalk4.white(bucket));
     console.log(chalk4.cyan("   Output:  ") + chalk4.white(outputDir));
-    console.log(chalk4.cyan("   Files:   ") + chalk4.white(total));
-    console.log(
-      chalk4.cyan("   Sections:") + chalk4.white(` ${manifest.counts.sections}`)
-    );
+    console.log(chalk4.cyan("   Files:   ") + chalk4.white(entries.length));
+    if (manifest.counts) {
+      console.log(
+        chalk4.cyan("   Sections:") + chalk4.white(` ${manifest.counts.sections}`)
+      );
+    }
     console.log();
   } catch (error) {
     spinner.fail(chalk4.red("Download failed"));
@@ -2441,6 +2466,210 @@ async function downloadCommand(options) {
     process.exit(1);
   }
 }
+function getS3Client3() {
+  const adapterMode = (process.env.ADAPTER_MODE || "aws").trim().toLowerCase();
+  if (adapterMode === "vps") {
+    const endpoint = process.env.MINIO_ENDPOINT || "localhost:9000";
+    const secure = process.env.MINIO_SECURE === "true";
+    const endpointUrl = endpoint.startsWith("http") ? endpoint : `${secure ? "https" : "http"}://${endpoint}`;
+    return new S3Client({
+      endpoint: endpointUrl,
+      region: "us-east-1",
+      credentials: {
+        accessKeyId: process.env.MINIO_ACCESS_KEY || "minioadmin",
+        secretAccessKey: process.env.MINIO_SECRET_KEY || "minioadmin"
+      },
+      forcePathStyle: true
+    });
+  }
+  if (adapterMode === "local") {
+    return new S3Client({
+      endpoint: "http://localhost:4569",
+      region: "ap-southeast-1",
+      credentials: {
+        accessKeyId: "S3RVER",
+        secretAccessKey: "S3RVER"
+      },
+      forcePathStyle: true
+    });
+  }
+  return new S3Client({
+    region: process.env.AWS_REGION || "ap-southeast-1"
+  });
+}
+function getBucketName3(env) {
+  if (process.env.BUCKET_NAME) {
+    return process.env.BUCKET_NAME;
+  }
+  const environment = env || process.env.ENVIRONMENT || "staging";
+  return environment === "production" ? "onex-themes-prod" : "onex-themes-staging";
+}
+async function streamToString2(stream) {
+  const chunks = [];
+  try {
+    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
+      const chunk = temp.value;
+      chunks.push(Buffer.from(chunk));
+    }
+  } catch (temp) {
+    error = [temp];
+  } finally {
+    try {
+      more && (temp = iter.return) && await temp.call(iter);
+    } finally {
+      if (error)
+        throw error[0];
+    }
+  }
+  return Buffer.concat(chunks).toString("utf-8");
+}
+async function streamToBuffer2(stream) {
+  const chunks = [];
+  try {
+    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
+      const chunk = temp.value;
+      chunks.push(Buffer.from(chunk));
+    }
+  } catch (temp) {
+    error = [temp];
+  } finally {
+    try {
+      more && (temp = iter.return) && await temp.call(iter);
+    } finally {
+      if (error)
+        throw error[0];
+    }
+  }
+  return Buffer.concat(chunks);
+}
+async function resolveLatestVersion2(s3Client, bucket, themeId) {
+  try {
+    const response = await s3Client.send(
+      new GetObjectCommand({
+        Bucket: bucket,
+        Key: `themes/${themeId}/latest.json`
+      })
+    );
+    const body = await streamToString2(response.Body);
+    return JSON.parse(body).version;
+  } catch (error) {
+    throw new Error(
+      `Failed to resolve latest version for theme "${themeId}": ${error.message}`
+    );
+  }
+}
+function runInstall(cwd) {
+  return new Promise((resolve) => {
+    const proc = spawn("pnpm", ["install"], {
+      cwd,
+      stdio: "inherit",
+      shell: true
+    });
+    proc.on("close", (code) => resolve(code === 0));
+    proc.on("error", () => resolve(false));
+  });
+}
+async function cloneCommand(themeName, options) {
+  logger.header("Clone Theme Source");
+  const spinner = ora("Initializing clone...").start();
+  try {
+    const bucket = options.bucket || getBucketName3(options.environment);
+    const outputDir = options.output || path.resolve(process.cwd(), themeName);
+    const s3Client = getS3Client3();
+    if (await fs.pathExists(outputDir)) {
+      spinner.fail(
+        chalk4.red(`Directory already exists: ${outputDir}`)
+      );
+      logger.info(
+        chalk4.gray(
+          "Use -o to specify a different output directory, or remove the existing directory."
+        )
+      );
+      process.exit(1);
+    }
+    let version = options.version || "latest";
+    if (version === "latest") {
+      spinner.text = "Resolving latest version...";
+      version = await resolveLatestVersion2(s3Client, bucket, themeName);
+      spinner.succeed(`Resolved latest version: ${chalk4.cyan(version)}`);
+    }
+    spinner.start(
+      `Downloading source.zip for ${themeName}@${version}...`
+    );
+    const s3Key = `themes/${themeName}/${version}/source.zip`;
+    let zipBuffer;
+    try {
+      const response = await s3Client.send(
+        new GetObjectCommand({
+          Bucket: bucket,
+          Key: s3Key
+        })
+      );
+      zipBuffer = await streamToBuffer2(response.Body);
+    } catch (error) {
+      spinner.fail(chalk4.red(`Source not found: s3://${bucket}/${s3Key}`));
+      console.log();
+      console.log(
+        chalk4.yellow("The theme source may not have been uploaded yet.")
+      );
+      console.log(
+        chalk4.gray(
+          `Upload source with: onex upload --theme ${themeName}`
+        )
+      );
+      console.log();
+      process.exit(1);
+    }
+    const sizeMB = (zipBuffer.length / 1024 / 1024).toFixed(2);
+    spinner.succeed(`Downloaded source.zip (${sizeMB} MB)`);
+    spinner.start(`Extracting to ${outputDir}...`);
+    await fs.ensureDir(outputDir);
+    const zip = new AdmZip(zipBuffer);
+    zip.extractAllTo(outputDir, true);
+    const entries = zip.getEntries().filter((e) => !e.isDirectory);
+    spinner.succeed(`Extracted ${entries.length} files`);
+    if (options.install !== false) {
+      const hasPkgJson = await fs.pathExists(
+        path.join(outputDir, "package.json")
+      );
+      if (hasPkgJson) {
+        spinner.start("Installing dependencies...");
+        const success = await runInstall(outputDir);
+        if (success) {
+          spinner.succeed("Dependencies installed");
+        } else {
+          spinner.warn(
+            chalk4.yellow(
+              "Failed to install dependencies \u2014 run 'pnpm install' manually"
+            )
+          );
+        }
+      }
+    }
+    console.log();
+    logger.success(chalk4.green.bold("Theme cloned successfully!"));
+    console.log();
+    console.log(
+      chalk4.cyan("   Theme:    ") + chalk4.white(`${themeName}@${version}`)
+    );
+    console.log(chalk4.cyan("   Location: ") + chalk4.white(outputDir));
+    console.log(chalk4.cyan("   Files:    ") + chalk4.white(entries.length));
+    console.log();
+    console.log(chalk4.cyan("Next steps:"));
+    console.log(
+      chalk4.gray(`   cd ${path.relative(process.cwd(), outputDir)}`)
+    );
+    if (options.install === false) {
+      console.log(chalk4.gray("   pnpm install"));
+    }
+    console.log(chalk4.gray("   onex build"));
+    console.log();
+  } catch (error) {
+    spinner.fail(chalk4.red(`Clone failed: ${error.message}`));
+    logger.error(error.stack || error.message);
+    process.exit(1);
+  }
+}
 
 // src/cli.ts
 var program = new Command();
@@ -2474,7 +2703,7 @@ program.command("upload").description("Upload compiled theme to S3 bucket").opti
   "-e, --environment <env>",
   "Environment (staging|production)",
   "staging"
-).option("--dry-run", "Show what would be uploaded without uploading").action(uploadCommand);
+).option("--dry-run", "Show what would be uploaded without uploading").option("--skip-source", "Skip uploading source.zip").option("--source-dir <dir>", "Source directory path").action(uploadCommand);
 program.command("download").description("Download theme from S3 bucket").option("-t, --theme-id <id>", "Theme ID to download").option(
   "-v, --version <version>",
   "Theme version (default: latest)",
@@ -2484,6 +2713,15 @@ program.command("download").description("Download theme from S3 bucket").option(
   "Environment (staging|production)",
   "staging"
 ).option("-o, --output <dir>", "Output directory", "./active-theme").action(downloadCommand);
+program.command("clone").description("Clone theme source code from S3").argument("<theme-name>", "Theme to clone").option(
+  "-v, --version <version>",
+  "Theme version (default: latest)",
+  "latest"
+).option("-o, --output <dir>", "Output directory").option("-b, --bucket <name>", "S3 bucket name").option(
+  "-e, --environment <env>",
+  "Environment (staging|production)",
+  "staging"
+).option("--no-install", "Skip running pnpm install after clone").action(cloneCommand);
 program.configureOutput({
   writeErr: (str) => process.stderr.write(chalk4.red(str))
 });